Merge pull request #584 from alexarchambault/graalvm-22.0.0

Update GraalVM to 22.0.0

Author: alexarchambault

.github/scripts/generate-native-image.sh

@@ -6,6 +6,11 @@ COMMAND="cli.base-image.writeNativeImageScript"
 # Using 'mill -i' so that the Mill process doesn't outlive this invocation
 
 if [[ "$OSTYPE" == "msys" ]]; then
+  ./mill.bat -i ci.copyJvm --dest jvm
+  export JAVA_HOME="$(pwd -W | sed 's,/,\\,g')\\jvm"
+  export GRAALVM_HOME="$JAVA_HOME"
+  export PATH="$(pwd)/bin:$PATH"
+  echo "PATH=$PATH"
   ./mill.bat -i "$COMMAND" generate-native-image.bat
   # Ideally, the generated script should create that directory itself
   mkdir -p out/cli/base-image/nativeImage/dest

build.sc

@@ -1,6 +1,6 @@
 import $ivy.`com.lihaoyi::mill-contrib-bloop:$MILL_VERSION`
 import $ivy.`io.get-coursier::coursier-launcher:2.1.0-M2`
-import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.14`
+import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.15`
 import $file.project.deps, deps.{Deps, Docker, InternalDeps, Scala, TestDeps}
 import $file.project.publish, publish.{ghOrg, ghName, ScalaCliPublishModule}
 import $file.project.settings, settings.{
@@ -1069,4 +1069,23 @@ object ci extends Module {
   def setShouldPublish() = T.command {
     publish.setShouldPublish()
   }
+
+  def copyJvm(jvm: String = deps.graalVmJvmId, dest: String = "jvm") = T.command {
+    import sys.process._
+    val command = Seq(
+      settings.cs(),
+      "java-home",
+      "--jvm",
+      jvm,
+      "--update",
+      "--ttl",
+      "0"
+    )
+    val baseJavaHome = os.Path(command.!!.trim, os.pwd)
+    System.err.println(s"Initial Java home $baseJavaHome")
+    val destJavaHome = os.Path(dest, os.pwd)
+    os.copy(baseJavaHome, destJavaHome, createFolders = true)
+    System.err.println(s"New Java home $destJavaHome")
+    destJavaHome
+  }
 }

modules/build/src/main/java/scala/build/internal/ChdirGraalvm.java

@@ -2,9 +2,9 @@
 
 import java.io.FileNotFoundException;
 
-import com.oracle.svm.core.CErrorNumber;
 import com.oracle.svm.core.annotate.Substitute;
 import com.oracle.svm.core.annotate.TargetClass;
+import com.oracle.svm.core.headers.LibC;
 import coursier.jvm.ErrnoException;
 import coursier.jvm.GraalvmErrnoExtras;
 import org.graalvm.nativeimage.c.type.CTypeConversion;
@@ -26,7 +26,7 @@ public static void chdir(String path) throws ErrnoException {
     int ret = GraalvmUnistdExtras.chdir(path0.get());
 
     if (ret != 0) {
-      int n = CErrorNumber.getCErrorNumber();
+      int n = LibC.errno();
       Throwable cause = null;
       if (n == GraalvmErrnoExtras.ENOENT() || n == GraalvmErrnoExtras.ENOTDIR())
         cause = new FileNotFoundException(path);

modules/build/src/test/scala/scala/build/tests/SourcesTests.scala

@@ -1,6 +1,5 @@
 package scala.build.tests
 
-import bloop.config.Config.ModuleKindJS
 import com.eed3si9n.expecty.Expecty.expect
 import dependency._
 import org.scalajs.linker.interface.{ESVersion, ModuleKind, ModuleSplitStyle}

project/deps.sc

@@ -106,12 +106,8 @@ object Deps {
   val metaconfigTypesafe       = ivy"com.geirsson::metaconfig-typesafe-config:0.9.15"
 }
 
-private def graalVmVersion =
-  if (Properties.isWin) "21.2.0"
-  else "21.3.0"
-def graalVmJvmId =
-  if (Properties.isWin) s"graalvm-java16:$graalVmVersion"
-  else s"graalvm-java17:$graalVmVersion"
+private def graalVmVersion = "22.0.0"
+def graalVmJvmId           = s"graalvm-java17:$graalVmVersion"
 
 def csDockerVersion = Deps.Versions.coursier
 

project/settings.sc

@@ -1,5 +1,5 @@
 import $ivy.`com.goyeau::mill-scalafix::0.2.8`
-import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.14`
+import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.15`
 import $file.deps, deps.{Deps, Docker, buildCsVersion}
 
 import com.goyeau.mill.scalafix.ScalafixModule