Skip to content

Commit 7ac3875

Browse files
committed
Switch graalvm-java17 to graalvm-community 17.0.9
1 parent 9334c06 commit 7ac3875

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
@@ -512,7 +512,7 @@ trait Core extends ScalaCliCrossSbtModule
512512
| def maxScalacArgumentsCount = 5000
513513
|
514514
| def defaultGraalVMJavaVersion = ${deps.graalVmJavaVersion}
515-
| def defaultGraalVMVersion = "${deps.graalVmVersion}"
515+
| def defaultGraalVMVersion = "${deps.graalVmCommunityVersion}"
516516
|
517517
| def scalaCliSigningOrganization = "${Deps.signingCli.dep.module.organization.value}"
518518
| def scalaCliSigningName = "${Deps.signingCli.dep.module.name.value}"
@@ -863,7 +863,7 @@ trait Cli extends CrossSbtModule with ProtoBuildModule with CliLaunchers
863863
| def ammoniteVersionForScala3Lts = "${Deps.Versions.ammoniteForScala3Lts}"
864864
| def defaultScalafmtVersion = "${Deps.scalafmtCli.dep.version}"
865865
| def defaultGraalVMJavaVersion = "${deps.graalVmJavaVersion}"
866-
| def defaultGraalVMVersion = "${deps.graalVmVersion}"
866+
| def defaultGraalVMVersion = "${deps.graalVmCommunityVersion}"
867867
| def scalaPyVersion = "${Deps.scalaPy.dep.version}"
868868
| def signingCliJvmVersion = ${Deps.Versions.signingCliJvmVersion}
869869
|}
@@ -1062,7 +1062,7 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
10621062
| def semanticDbJavacPluginVersion = "${Deps.semanticDbJavac.dep.version}"
10631063
| def ammoniteVersion = "${Deps.ammonite.dep.version}"
10641064
| def defaultGraalVMJavaVersion = "${deps.graalVmJavaVersion}"
1065-
| def defaultGraalVMVersion = "${deps.graalVmVersion}"
1065+
| def defaultGraalVMVersion = "${deps.graalVmCommunityVersion}"
10661066
| def scalaPyVersion = "${Deps.scalaPy.dep.version}"
10671067
| def scalaPyMaxScalaNative = "${Deps.Versions.maxScalaNativeForScalaPy}"
10681068
| def bloopVersion = "${Deps.bloopRifle.dep.version}"

project/deps.sc

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

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

274275
def csDockerVersion = Deps.Versions.coursierCli
275276

0 commit comments

Comments
 (0)