Update mill-main to 0.11.6 (#2572)

* Update mill-main to 0.11.6 * Update default version in `millw` to `0.11.6` * Add missing `jsoniter-macros` dependency * Update default mill version in `mill.bat` to 0.11.6 * Format native image configuration * Fix backwards incompatibilities in the `mill` build definition --------- Co-authored-by: Piotr Chabelski <[email protected]>
VirtusLab · Nov 23, 2023 · 5c243b5 · 5c243b5
1 parent 464ee18
commit 5c243b5
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 88 deletions.
diff --git a/.mill-version b/.mill-version
@@ -1 +1 @@
-0.11.1
+0.11.6
diff --git a/build.sc b/build.sc
@@ -848,6 +848,10 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
       super.runClasspath() ++ Seq(localRepoJar())
     }
 
+    def compileIvyDeps = super.ivyDeps() ++ Agg(
+      Deps.jsoniterMacros
+    )
+
     // Required by the reflection usage in modules/cli/src/test/scala/cli/tests/SetupScalaCLITests.scala
     override def forkArgs: T[Seq[String]] = T {
       super.forkArgs() ++ Seq("--add-opens=java.base/java.util=ALL-UNNAMED")
@@ -949,46 +953,32 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
     }
     def generatedSources = super.generatedSources() ++ Seq(constantsFile())
 
-    private final class TestHelper(
-      launcherTask: T[PathRef],
-      cliKind: String
-    ) {
-      def test(args: String*) = {
-        val argsTask = T.task {
-          val launcher = launcherTask().path
-          val debugReg = "^--debug$|^--debug:([0-9]+)$".r
-          val debugPortOpt = args.find(debugReg.matches).flatMap {
-            case debugReg(port) => Option(port).orElse(Some("5005"))
-            case _              => None
-          }
-          val debugArgs = debugPortOpt match {
-            case Some(port) =>
-              System.err.println(
-                s"--debug option has been passed. Listening for transport dt_socket at address: $port"
-              )
-              Seq(s"-Dtest.scala-cli.debug.port=$port")
-            case _ => Seq.empty
-          }
-          val extraArgs = Seq(
-            s"-Dtest.scala-cli.path=$launcher",
-            s"-Dtest.scala-cli.kind=$cliKind"
-          )
-          args ++ extraArgs ++ debugArgs
+    def runTests(launcherTask: T[PathRef], cliKind: String, args: String*) = {
+      val argsTask = T.task {
+        val launcher = launcherTask().path
+        val debugReg = "^--debug$|^--debug:([0-9]+)$".r
+        val debugPortOpt = args.find(debugReg.matches).flatMap {
+          case debugReg(port) => Option(port).orElse(Some("5005"))
+          case _              => None
         }
-        T.command {
-          val res            = testTask(argsTask, T.task(Seq.empty[String]))()
-          val dotScalaInRoot = os.pwd / workspaceDirName
-          assert(
-            !os.isDir(dotScalaInRoot),
-            s"Expected $workspaceDirName ($dotScalaInRoot) not to have been created"
-          )
-          res
+        val debugArgs = debugPortOpt match {
+          case Some(port) =>
+            System.err.println(
+              s"--debug option has been passed. Listening for transport dt_socket at address: $port"
+            )
+            Seq(s"-Dtest.scala-cli.debug.port=$port")
+          case _ => Seq.empty
         }
+        val extraArgs = Seq(
+          s"-Dtest.scala-cli.path=$launcher",
+          s"-Dtest.scala-cli.kind=$cliKind"
+        )
+        args ++ extraArgs ++ debugArgs
       }
+      testTask(argsTask, T.task(Seq.empty[String]))
     }
 
-    def test(args: String*) =
-      jvm(args: _*)
+    override def test(args: String*) = jvm(args: _*)
 
     def forcedLauncher = T.persistent {
       val ext      = if (Properties.isWin) ".exe" else ""
@@ -1033,36 +1023,38 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
       PathRef(launcher)
     }
 
-    def jvm(args: String*) =
-      new TestHelper(
-        cli.standaloneLauncher,
-        "jvm"
-      ).test(args: _*)
+    private object Launchers {
+      def jvm = cli.standaloneLauncher
+
+      def jvmBootstrapped = cliBootstrapped.jar
+
+      def native =
+        Option(System.getenv("SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY")) match {
+          case Some(_) => forcedLauncher
+          case None    => cli.nativeImage
+        }
+
+      def nativeStatic =
+        Option(System.getenv("SCALA_CLI_IT_FORCED_STATIC_LAUNCHER_DIRECTORY")) match {
+          case Some(_) => forcedStaticLauncher
+          case None    => cli.nativeImageStatic
+        }
+
+      def nativeMostlyStatic =
+        Option(System.getenv("SCALA_CLI_IT_FORCED_MOSTLY_STATIC_LAUNCHER_DIRECTORY")) match {
+          case Some(_) => forcedMostlyStaticLauncher
+          case None    => cli.nativeImageMostlyStatic
+        }
+    }
+
+    def jvm(args: String*) = T.command(runTests(Launchers.jvm, "jvm", args: _*))
     def jvmBootstrapped(args: String*) =
-      new TestHelper(
-        cliBootstrapped.jar,
-        "jvmBootstrapped"
-      ).test(args: _*)
-    def native(args: String*) =
-      new TestHelper(
-        if (System.getenv("SCALA_CLI_IT_FORCED_LAUNCHER_DIRECTORY") == null) cli.nativeImage
-        else forcedLauncher,
-        "native"
-      ).test(args: _*)
+      T.command(runTests(Launchers.jvmBootstrapped, "jvmBootstrapped", args: _*))
+    def native(args: String*) = T.command(runTests(Launchers.native, "native", args: _*))
     def nativeStatic(args: String*) =
-      new TestHelper(
-        if (System.getenv("SCALA_CLI_IT_FORCED_STATIC_LAUNCHER_DIRECTORY") == null)
-          cli.nativeImageStatic
-        else forcedStaticLauncher,
-        "native-static"
-      ).test(args: _*)
+      T.command(runTests(Launchers.nativeStatic, "native-static", args: _*))
     def nativeMostlyStatic(args: String*) =
-      new TestHelper(
-        if (System.getenv("SCALA_CLI_IT_FORCED_MOSTLY_STATIC_LAUNCHER_DIRECTORY") == null)
-          cli.nativeImageMostlyStatic
-        else forcedMostlyStaticLauncher,
-        "native-mostly-static"
-      ).test(args: _*)
+      T.command(runTests(Launchers.nativeMostlyStatic, "native-mostly-static", args: _*))
   }
 }
 

diff --git a/mill.bat b/mill.bat
@@ -16,7 +16,7 @@ rem but I don't think we need to support them in 2019
 setlocal enabledelayedexpansion
 
 if [!DEFAULT_MILL_VERSION!]==[] (
-    set "DEFAULT_MILL_VERSION=0.10.12"
+    set "DEFAULT_MILL_VERSION=0.11.6"
 )
 
 set "MILL_REPO_URL=https://github.com/com-lihaoyi/mill"

diff --git a/millw b/millw
@@ -14,7 +14,7 @@
 set -e
 
 if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
-  DEFAULT_MILL_VERSION=0.10.12
+  DEFAULT_MILL_VERSION=0.11.6
 fi
 
 

diff --git a/modules/cli/src/main/resources/META-INF/native-image/extras/pprint/reflect-config.json b/modules/cli/src/main/resources/META-INF/native-image/extras/pprint/reflect-config.json
@@ -4,8 +4,7 @@
     "methods": [
       {
         "name": "collectionClassName",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   }

diff --git a/...cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/jni-config.json b/...cli/src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/jni-config.json
@@ -27,8 +27,7 @@
     "methods": [
       {
         "name": "getPlatformClassLoader",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },

diff --git a/...src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json b/...src/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/reflect-config.json
@@ -828,8 +828,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -838,8 +837,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -929,8 +927,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -950,8 +947,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -961,8 +957,7 @@
     "methods": [
       {
         "name": "<init>",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -971,8 +966,7 @@
     "methods": [
       {
         "name": "values",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },
@@ -981,8 +975,7 @@
     "methods": [
       {
         "name": "values",
-        "parameterTypes": [
-        ]
+        "parameterTypes": []
       }
     ]
   },

diff --git a/...rc/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/resource-config.json b/...rc/main/resources/META-INF/native-image/org.virtuslab/scala-cli-core/resource-config.json
@@ -27,6 +27,5 @@
       }
     ]
   },
-  "bundles": [
-  ]
+  "bundles": []
 }
diff --git a/project/settings.sc b/project/settings.sc
@@ -540,13 +540,12 @@ trait HasTests extends SbtModule {
       else Nil
     super.scalacOptions() ++ extraOptions
   }
-  trait ScalaCliTests extends ScalaCliModule with super.SbtModuleTests {
+  trait ScalaCliTests extends ScalaCliModule with super.SbtModuleTests with TestModule.Munit {
     def ivyDeps = super.ivyDeps() ++ Agg(
       Deps.expecty,
       Deps.munit
     )
-    def testFramework = "munit.Framework"
-    def forkArgs      = super.forkArgs() ++ Seq("-Xmx512m", "-Xms128m")
+    def forkArgs = super.forkArgs() ++ Seq("-Xmx512m", "-Xms128m")
 
     def repositoriesTask =
       T.task(super.repositoriesTask() ++ deps.customRepositories)
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,7 +14,7 @@ @@
     set -e
     if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
-      DEFAULT_MILL_VERSION=0.10.12
+      DEFAULT_MILL_VERSION=0.11.6
     fi
@@ Expand Down @@