Skip to content

Commit f40cfd3

Browse files
committed
Switch graalvm-java17 to graalvm-community 17.0.9
1 parent dc370a1 commit f40cfd3

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

build.sc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ trait Core extends ScalaCliCrossSbtModule
513513
| def maxScalacArgumentsCount = 5000
514514
|
515515
| def defaultGraalVMJavaVersion = ${deps.graalVmJavaVersion}
516-
| def defaultGraalVMVersion = "${deps.graalVmVersion}"
516+
| def defaultGraalVMVersion = "${deps.graalVmCommunityVersion}"
517517
|
518518
| def scalaCliSigningOrganization = "${Deps.signingCli.dep.module.organization.value}"
519519
| def scalaCliSigningName = "${Deps.signingCli.dep.module.name.value}"
@@ -865,7 +865,7 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers
865865
| def ammoniteVersionForScala3Lts = "${Deps.Versions.ammoniteForScala3Lts}"
866866
| def defaultScalafmtVersion = "${Deps.scalafmtCli.dep.version}"
867867
| def defaultGraalVMJavaVersion = "${deps.graalVmJavaVersion}"
868-
| def defaultGraalVMVersion = "${deps.graalVmVersion}"
868+
| def defaultGraalVMVersion = "${deps.graalVmCommunityVersion}"
869869
| def scalaPyVersion = "${Deps.scalaPy.dep.version}"
870870
| def signingCliJvmVersion = ${Deps.Versions.signingCliJvmVersion}
871871
|}
@@ -1065,7 +1065,7 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
10651065
| def semanticDbJavacPluginVersion = "${Deps.semanticDbJavac.dep.version}"
10661066
| def ammoniteVersion = "${Deps.ammonite.dep.version}"
10671067
| def defaultGraalVMJavaVersion = "${deps.graalVmJavaVersion}"
1068-
| def defaultGraalVMVersion = "${deps.graalVmVersion}"
1068+
| def defaultGraalVMVersion = "${deps.graalVmCommunityVersion}"
10691069
| def scalaPyVersion = "${Deps.scalaPy.dep.version}"
10701070
| def scalaPyMaxScalaNative = "${Deps.Versions.maxScalaNativeForScalaPy}"
10711071
| def bloopVersion = "${Deps.bloopRifle.dep.version}"

project/deps.sc

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ object Deps {
248248
.exclude(("org.scala-lang.modules", "scala-collection-compat_2.13"))
249249
def slf4jNop = ivy"org.slf4j:slf4j-nop:2.0.16"
250250
def sttp = ivy"com.softwaremill.sttp.client3:core_2.13:3.10.3"
251-
def svm = ivy"org.graalvm.nativeimage:svm:$graalVmVersion"
251+
def svm = ivy"org.graalvm.nativeimage:svm:$graalSvmVersion"
252252
def swoval = ivy"com.swoval:file-tree-views:2.1.12"
253253
def testInterface = ivy"org.scala-sbt:test-interface:1.0"
254254
val toolkitVersion = "0.6.0"
@@ -268,9 +268,10 @@ object Deps {
268268
def scalafixInterfaces = ivy"ch.epfl.scala:scalafix-interfaces:${Versions.scalafix}"
269269
}
270270

271-
def graalVmVersion = "22.3.1"
272-
def graalVmJavaVersion = Java.defaultJava
273-
def graalVmJvmId = s"graalvm-java$graalVmJavaVersion:$graalVmVersion"
271+
def graalVmJavaVersion = Java.defaultJava
272+
def graalVmCommunityVersion = s"$graalVmJavaVersion.0.9"
273+
def graalSvmVersion = "22.3.1"
274+
def graalVmJvmId = s"graalvm-community:$graalVmCommunityVersion"
274275

275276
def csDockerVersion = Deps.Versions.coursierCli
276277

0 commit comments

Comments
 (0)