Fixed mapping for jvmId in build conversions

Author: ajaychandran

example/migrating/javalib/3-maven-complete-large/.env-jvm-version

@@ -0,0 +1 @@
+zulu:21

example/migrating/javalib/3-maven-complete-large/build.mill

@@ -8,8 +8,6 @@
 
 > ./mill init
 
-> echo 21 > .mill-jvm-version # Repo needs Java >=21 to build and test
-
 > rm twin/src/test/java/com/iluwatar/twin/BallThreadTest.java # skip flaky test
 > rm actor-model/src/test/java/com/iluwatar/actor/ActorModelTest.java # skip flaky test
 

example/migrating/javalib/4-gradle-complete/.env-jvm-version

@@ -0,0 +1 @@
+zulu:17

example/migrating/javalib/5-gradle-incomplete/.env-jvm-version

@@ -0,0 +1 @@
+zulu:17

example/migrating/javalib/5-gradle-incomplete/build.mill

@@ -4,12 +4,13 @@
 
 > git init .
 > git remote add -f origin https://github.com/mockito/mockito.git
-> git checkout v5.19.0 # multi-module Java project
+> git checkout v5.20.0 # multi-module Java project
 
-> ./mill init --gradle-jvm-id 17  # imported modules are not fully functional
+> ./mill init # imported modules are not fully functional
 converting Gradle build
 init completed, run "mill resolve _" to list available tasks
 
-> ./mill mockito-core.compile   # module jvmId needs tweaking
-error: java.lang.UnsupportedClassVersionError: com/google/errorprone/ErrorProneJavacPlugin has been compiled by a more recent version...
+> ./mill mockito-core.compile   # Compilation needs manual tweaking to pass
+compiling 477 Java sources...
+error: ...mockito-core/src/main/java/module-info.java:8:17: module not found: net.bytebuddy
 */

example/package.mill

@@ -13,6 +13,7 @@ import mill.contrib.buildinfo.BuildInfo
 import mill.T
 import mill.api.Cross
 import mill.api.BuildCtx
+import java.io.File.pathSeparator
 
 object `package` extends Module {
   def exampleModules: Seq[ExampleCrossModule] = moduleInternal
@@ -65,8 +66,8 @@ object `package` extends Module {
   }
 
   object migrating extends Module {
-    object javalib extends Cross[ExampleCrossModule](build.listCross)
-    object scalalib extends Cross[ExampleCrossModule](build.listCross)
+    object javalib extends Cross[ExampleCrossModuleMigrating](build.listCross)
+    object scalalib extends Cross[ExampleCrossModuleMigrating](build.listCross)
   }
   object javascriptlib extends Module {
     object basic extends Cross[ExampleCrossModule](build.listCross)
@@ -122,6 +123,26 @@ object `package` extends Module {
     object typescript extends Cross[ExampleCrossModule](build.listCross)
   }
 
+  trait ExampleCrossModuleMigrating extends ExampleCrossModule {
+    def forkEnvJvmIdFile = Task.Source(".env-jvm-version")
+    def forkEnvJvmId = Task {
+      val file = forkEnvJvmIdFile().path
+      if (os.exists(file)) BuildCtx.withFilesystemCheckerDisabled {
+        os.read(file)
+      }
+      else "zulu:11"
+    }
+    def forkEnv = Task {
+      val javaHome = Jvm.resolveJavaHome(forkEnvJvmId()).get
+      val javaExe = Jvm.javaExe(Some(javaHome))
+      Map(
+        "MILL_INTEGRATION_PROPAGATE_JAVA_HOME" -> "false",
+        "JAVA_HOME" -> javaHome.toString,
+        "PATH" -> s"$javaExe$pathSeparator${System.getenv("PATH")}"
+      )
+    }
+  }
+
   trait ExampleCrossModuleKotlin extends ExampleCrossModuleJava {
 
     override def lineTransform(line: String) = this.moduleSegments.parts.last match {

integration/manual/migrating/src/MillInitGradleAsmTests.scala

@@ -2,12 +2,14 @@ package mill.integration
 import utest.*
 object MillInitGradleAsmTests extends MillInitTestSuite {
   def tests = Tests {
-    test - checkImport(
-      gitUrl = "https://gitlab.ow2.org/asm/asm.git",
-      gitBranch = "ASM_9_8",
-      initArgs = Seq("--gradle-jvm-id", "11"),
+    test("realistic") - checkImport(
+      "https://gitlab.ow2.org/asm/asm.git",
+      "ASM_9_9",
       passingTasks = Seq("asm.compile"),
-      failingTasks = Seq("tools.retrofitter.compile")
+      failingTasks = Seq(
+        // requires custom source dir
+        "tools.retrofitter.compile"
+      )
     )
   }
 }

integration/manual/migrating/src/MillInitGradleEhcache3Tests.scala

@@ -2,11 +2,15 @@ package mill.integration
 import utest.*
 object MillInitGradleEhcache3Tests extends MillInitTestSuite {
   def tests = Tests {
-    test - checkImport(
-      gitUrl = "https://github.com/ehcache/ehcache3.git",
-      gitBranch = "v3.10.8",
-      initArgs = Seq("--gradle-jvm-id", "11"),
-      failingTasks = Seq("ehcache-api.compile")
+    test("realistic") - checkImport(
+      "https://github.com/ehcache/ehcache3.git",
+      "v3.11.1",
+      passingTasks = Seq(("resolve", "_")),
+      failingTasks = Seq(
+        // Gradle auto-configures -proc:none
+        "ehcache-api.compile"
+      ),
+      envJvmId = "zulu:17"
     )
   }
 }

integration/manual/migrating/src/MillInitGradleFastCsvTests.scala

@@ -2,11 +2,15 @@ package mill.integration
 import utest.*
 object MillInitGradleFastCsvTests extends MillInitTestSuite {
   def tests = Tests {
-    test - checkImport(
-      gitUrl = "https://github.com/osiegmar/FastCSV.git",
-      gitBranch = "v4.0.0",
-      initArgs = Seq("--gradle-jvm-id", "24"),
-      failingTasks = Seq("lib.compile")
+    test("realistic") - checkImport(
+      "https://github.com/osiegmar/FastCSV.git",
+      "v4.1.0",
+      passingTasks = Seq(("resolve", "_")),
+      failingTasks = Seq(
+        // Gradle auto-configures -proc:none
+        "lib.compile"
+      ),
+      envJvmId = "zulu:24" // 25 is not available in Coursier index
     )
   }
 }

integration/manual/migrating/src/MillInitGradleJCommanderTests.scala

@@ -2,11 +2,15 @@ package mill.integration
 import utest.*
 object MillInitGradleJCommanderTests extends MillInitTestSuite {
   def tests = Tests {
-    test - checkImport(
-      gitUrl = "https://github.com/cbeust/jcommander.git",
-      gitBranch = "2.0",
-      initArgs = Seq("--gradle-jvm-id", "11"),
-      failingTasks = Seq("test.compile")
+    test("realistic") - checkImport(
+      "https://github.com/cbeust/jcommander.git",
+      "3.0",
+      passingTasks = Seq("compile"),
+      failingTasks = Seq(
+        // localCompileClasspath hidden by circular transitive dep
+        "test.compile"
+      ),
+      envJvmId = "zulu:17"
     )
   }
 }