Update GraalVM to 22.2.0 (#1208)

VirtusLab · Jul 29, 2022 · 9d62cc5 · 9d62cc5
1 parent c14a2fe
commit 9d62cc5
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 12 deletions.
diff --git a/.github/scripts/generate-native-image.sh b/.github/scripts/generate-native-image.sh
@@ -3,6 +3,10 @@ set -e
 
 COMMAND="cli.base-image.writeNativeImageScript"
 
+# temporary, until we pass JPMS options to native-image,
+# see https://www.graalvm.org/release-notes/22_2/#native-image
+export USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=false
+
 # Using 'mill -i' so that the Mill process doesn't outlive this invocation
 
 if [[ "$OSTYPE" == "msys" ]]; then

diff --git a/mill b/mill
@@ -192,4 +192,8 @@ eval "$(cs java --env --jvm temurin:17 || cs java --env --jvm openjdk:1.17.0)"
 init_mill_jvm_opts
 init_mill_cs_opts
 
+# temporary, until we pass JPMS options to native-image,
+# see https://www.graalvm.org/release-notes/22_2/#native-image
+export USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=false
+
 exec "$cs" launch "$MILL_APP_NAME:$MILL_VERSION" "${mill_cs_opts[@]}" -- "$@"
diff --git a/project/deps.sc b/project/deps.sc
@@ -136,7 +136,7 @@ object Deps {
     if (force213) ivy"io.github.alexarchambault.scala-cli.snailgun:snailgun-core_2.13:0.4.1-sc2"
     else ivy"io.github.alexarchambault.scala-cli.snailgun::snailgun-core:0.4.1-sc2"
   def sttp            = ivy"com.softwaremill.sttp.client3:core_2.13:3.7.1"
-  def svm             = ivy"org.graalvm.nativeimage:svm:22.0.0.2"
+  def svm             = ivy"org.graalvm.nativeimage:svm:$graalVmVersion"
   def swoval          = ivy"com.swoval:file-tree-views:2.1.9"
   def testInterface   = ivy"org.scala-sbt:test-interface:1.0"
   def usingDirectives = ivy"org.virtuslab:using_directives:0.0.8"
@@ -151,7 +151,7 @@ object BuildDeps {
   def scalaCliVersion = "0.1.9"
 }
 
-def graalVmVersion     = "22.1.0"
+def graalVmVersion     = "22.2.0"
 def graalVmJavaVersion = 17
 def graalVmJvmId       = s"graalvm-java$graalVmJavaVersion:$graalVmVersion"
 

diff --git a/project/settings.sc b/project/settings.sc
@@ -285,28 +285,36 @@ trait CliLaunchers extends SbtModule { self =>
     def launcherKind = "default"
   }
 
+  private def maybePassNativeImageJpmsOption =
+    Option(System.getenv("USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM"))
+      .fold("") { value =>
+        "export USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=" + value + System.lineSeparator()
+      }
+
   object `linux-docker-image` extends CliNativeImage {
     def launcherKind = `base-image`.launcherKind
     def nativeImageDockerParams = Some(
       NativeImage.DockerParams(
         imageName = "ubuntu:18.04",
         prepareCommand =
-          """apt-get update -q -y &&\
-            |apt-get install -q -y build-essential libz-dev locales
-            |locale-gen en_US.UTF-8
-            |export LANG=en_US.UTF-8
-            |export LANGUAGE=en_US:en
-            |export LC_ALL=en_US.UTF-8""",
+          maybePassNativeImageJpmsOption +
+            """apt-get update -q -y &&\
+              |apt-get install -q -y build-essential libz-dev locales
+              |locale-gen en_US.UTF-8
+              |export LANG=en_US.UTF-8
+              |export LANGUAGE=en_US:en
+              |export LC_ALL=en_US.UTF-8""".stripMargin,
         csUrl =
           s"https://github.com/coursier/coursier/releases/download/v${deps.csDockerVersion}/cs-x86_64-pc-linux.gz",
         extraNativeImageArgs = Nil
       )
     )
   }
 
-  private def setupLocale(params: NativeImage.DockerParams): NativeImage.DockerParams =
+  private def setupLocaleAndOptions(params: NativeImage.DockerParams): NativeImage.DockerParams =
     params.copy(
-      prepareCommand = params.prepareCommand +
+      prepareCommand = maybePassNativeImageJpmsOption +
+        params.prepareCommand +
         """
           |set -v
           |apt-get update
@@ -329,7 +337,7 @@ trait CliLaunchers extends SbtModule { self =>
         Docker.muslBuilder,
         s"https://github.com/coursier/coursier/releases/download/v${deps.csDockerVersion}/cs-x86_64-pc-linux.gz"
       )
-      val dockerParams = setupLocale(baseDockerParams)
+      val dockerParams = setupLocaleAndOptions(baseDockerParams)
       buildHelperImage()
       Some(dockerParams)
     }
@@ -351,7 +359,7 @@ trait CliLaunchers extends SbtModule { self =>
         "ubuntu:18.04", // TODO Pin that
         s"https://github.com/coursier/coursier/releases/download/v${deps.csDockerVersion}/cs-x86_64-pc-linux.gz"
       )
-      val dockerParams = setupLocale(baseDockerParams)
+      val dockerParams = setupLocaleAndOptions(baseDockerParams)
       Some(dockerParams)
     }
   }