Bump Mill to 0.12.10

Author: Gedochao

.github/workflows/ci.yml

@@ -23,14 +23,14 @@ jobs:
         with:
           jvm: temurin:17
       - run: |
-          ./mill -i "java-class-name.writeNativeImageScript" generate.sh "" && \
+          ./mill -i "java-class-name.writeNativeImageScript" --scriptDest generate.sh --imageDest "" && \
           ./generate.sh && \
-          ./mill -i "java-class-name.copyToArtifacts" artifacts/
+          ./mill -i "java-class-name.copyToArtifacts" --directory artifacts/
         if: runner.os != 'Windows'
       - run: |
-          @call ./mill.bat -i "java-class-name.writeNativeImageScript" generate.bat ""
+          @call ./mill.bat -i "java-class-name.writeNativeImageScript" --scriptDest generate.bat --imageDest ""
           @call generate.bat
-          @call ./mill.bat -i "java-class-name.copyToArtifacts" artifacts/
+          @call ./mill.bat -i "java-class-name.copyToArtifacts" --directory artifacts/
         shell: cmd
         if: runner.os == 'Windows'
       - name: Test
@@ -41,7 +41,7 @@ jobs:
           path: artifacts/
           if-no-files-found: error
           retention-days: 1
-      - run: ./mill -i ci.upload artifacts/
+      - run: ./mill -i ci.upload --directory artifacts/
         if: github.event_name == 'push'
         env:
           UPLOAD_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -58,9 +58,9 @@ jobs:
         with:
           jvm: temurin:17
       - run: |
-          ./mill -i "java-class-name.static.writeNativeImageScript" generate.sh "" && \
+          ./mill -i "java-class-name.static.writeNativeImageScript" --scriptDest generate.sh --imageDest "" && \
           ./generate.sh && \
-          ./mill -i "java-class-name.static.copyToArtifacts" artifacts/
+          ./mill -i "java-class-name.static.copyToArtifacts" --directory artifacts/
       - uses: actions/upload-artifact@v4
         with:
           name: launcher-linux-static
@@ -69,7 +69,7 @@ jobs:
           retention-days: 1
       - name: Test
         run: ./mill -i java-class-name-tests.static.test
-      - run: ./mill -i ci.upload artifacts/
+      - run: ./mill -i ci.upload --directory artifacts/
         if: github.event_name == 'push'
         env:
           UPLOAD_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -86,9 +86,9 @@ jobs:
         with:
           jvm: temurin:17
       - run: |
-          ./mill -i "java-class-name.mostly-static.writeNativeImageScript" generate.sh "" && \
+          ./mill -i "java-class-name.mostly-static.writeNativeImageScript" --scriptDest generate.sh --imageDest "" && \
           ./generate.sh && \
-          ./mill -i "java-class-name.mostly-static.copyToArtifacts" artifacts/
+          ./mill -i "java-class-name.mostly-static.copyToArtifacts" --directory artifacts/
       - uses: actions/upload-artifact@v4
         with:
           name: launcher-linux-mostly-static
@@ -97,7 +97,7 @@ jobs:
           retention-days: 1
       - name: Test
         run: ./mill -i java-class-name-tests.mostly-static.test
-      - run: ./mill -i ci.upload artifacts/
+      - run: ./mill -i ci.upload --directory artifacts/
         if: github.event_name == 'push'
         env:
           UPLOAD_GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.mill-version

@@ -1 +1 @@
-0.11.13
+0.12.10

build.sc

@@ -1,15 +1,15 @@
 import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.1`
 import $ivy.`io.github.alexarchambault.mill::mill-native-image::0.1.31-1`
 import $ivy.`io.github.alexarchambault.mill::mill-native-image-upload:0.1.31-1`
-
 import de.tobiasroeser.mill.vcs.version._
 import io.github.alexarchambault.millnativeimage.NativeImage
 import io.github.alexarchambault.millnativeimage.upload.Upload
 import mill._
 import mill.scalalib._
-import coursier.core.Version
-import scala.concurrent.duration.DurationInt
+import coursier.core.{Dependency, DependencyManagement}
+import coursier.version.VersionConstraint
 
+import scala.concurrent.duration.DurationInt
 import java.io.File
 
 object Versions {
@@ -23,8 +23,7 @@ object Versions {
 }
 
 trait JavaMainClassNativeImage extends NativeImage {
-
-  def nativeImageOptions = T{
+  def nativeImageOptions = T {
     super.nativeImageOptions() ++ Seq(
       "--no-fallback"
     )
@@ -33,37 +32,45 @@ trait JavaMainClassNativeImage extends NativeImage {
   def nativeImageGraalVmJvmId = s"graalvm-java17:${Versions.graalVmVersion}"
   def nativeImageName = "java-class-name"
   def nativeImageMainClass = "scala.cli.javaclassname.JavaClassName"
-
   def nameSuffix = ""
+
   def copyToArtifacts(directory: String = "artifacts/") = T.command {
-    val _ = Upload.copyLauncher(
-      nativeImage().path,
-      directory,
-      "java-class-name",
+    val _ = Upload.copyLauncher0(
+      nativeLauncher = nativeImage().path,
+      directory = directory,
+      name = "java-class-name",
       compress = true,
+      workspace = T.workspace,
       suffix = nameSuffix
     )
   }
 }
 
 trait JavaClassNameModule extends ScalaModule {
   override def scalaVersion = Versions.scala
-  override def transitiveIvyDeps = T {
-    super.transitiveIvyDeps()
-      .map(_.exclude("org.jline" -> "jline-reader"))
-      .map(_.exclude("org.jline" -> "jline-terminal"))
-      .map(_.exclude("org.jline" -> "jline-terminal-jna"))
-      .map(_.exclude("org.jline" -> "jline-terminal-jni"))
-      .map(_.exclude("org.jline" -> "jline-native"))
-  }
+
+  private def jlineOrg = "org.jline"
   def jlineDeps = Agg(
-    ivy"org.jline:jline-reader:${Versions.jline}",
-    ivy"org.jline:jline-terminal:${Versions.jline}",
-    ivy"org.jline:jline-terminal-jna:${Versions.jline}",
-    ivy"org.jline:jline-terminal-jni:${Versions.jline}",
-    ivy"org.jline:jline-native:${Versions.jline}"
+    ivy"$jlineOrg:jline-reader:${Versions.jline}",
+    ivy"$jlineOrg:jline-terminal:${Versions.jline}",
+    ivy"$jlineOrg:jline-terminal-jna:${Versions.jline}",
+    ivy"$jlineOrg:jline-terminal-jni:${Versions.jline}",
+    ivy"$jlineOrg:jline-native:${Versions.jline}"
   )
-  override def ivyDeps = super.ivyDeps() ++ jlineDeps
+
+  override def coursierDependency: Dependency =
+    super.coursierDependency
+      .addOverrides(
+        jlineDeps.toSeq.map(jd => DependencyManagement.Key.from(jd.toDependency(jd.version, jd.version, "")) ->
+          DependencyManagement.Values.empty.withVersionConstraint(VersionConstraint.Lazy(Versions.jline)))
+      )
+
+  override def allIvyDeps = T {
+    super.allIvyDeps()
+      .map(_.exclude(jlineOrg -> "jline-*")) ++ jlineDeps
+  }
+
+  override def ivyDeps = super.ivyDeps().map(_.exclude("org.jline" -> "jline-*")) ++ jlineDeps
 }
 
 object `scala3-graal-processor` extends JavaClassNameModule {
@@ -78,41 +85,47 @@ object `java-class-name` extends JavaClassNameModule with JavaMainClassNativeIma
     // adapted from https://github.com/VirtusLab/scala-cli/blob/b19086697401827a6f8185040ceb248d8865bf21/build.sc#L732-L744
 
     val classpath = runClasspath().map(_.path).mkString(File.pathSeparator)
-    val cache     = T.dest / "native-cp"
+    val cache = T.dest / "native-cp"
     // `scala3-graal-processor`.run() do not give me output and I cannot pass dynamically computed values like classpath
     System.err.println("Calling scala3 graal processor on")
     for (f <- classpath.split(File.pathSeparator))
       System.err.println(s"  $f")
-    val res = mill.modules.Jvm.callSubprocess(
+    val res = mill.util.Jvm.callProcess(
       mainClass = `scala3-graal-processor`.finalMainClass(),
       classPath = `scala3-graal-processor`.runClasspath().map(_.path),
-      mainArgs = Seq(cache.toNIO.toString, classpath),
-      workingDir = os.pwd
+      mainArgs = Seq(cache.toNIO.toString, classpath)
     )
     val cp = res.out.text.trim
+    if (cp.isBlank) System.err.println("class path can't be empty!")
+    assert(cp.nonEmpty)
     System.err.println("Processed class path:")
     for (f <- cp.split(File.pathSeparator))
       System.err.println(s"  $f")
     cp.split(File.pathSeparator).toSeq.map(p => mill.PathRef(os.Path(p)))
   }
+
   override def ivyDeps = super.ivyDeps() ++ jlineDeps ++ Agg(
     ivy"org.scala-lang::scala3-compiler:${Versions.scala}"
   )
+
   override def compileIvyDeps = super.compileIvyDeps() ++ Agg(
     ivy"org.graalvm.nativeimage:svm:${Versions.graalVmVersion}"
   )
 
   object static extends JavaMainClassNativeImage {
     def nameSuffix = "-static"
-    def nativeImageClassPath = T{
+
+    def nativeImageClassPath = T {
       `java-class-name`.nativeImageClassPath()
     }
+
     def buildHelperImage = T {
       os.proc("docker", "build", "-t", "scala-cli-base-musl:latest", ".")
-        .call(cwd = os.pwd / "musl-image", stdout = os.Inherit)
+        .call(cwd = T.workspace / "musl-image", stdout = os.Inherit)
       ()
     }
-    def nativeImageDockerParams = T{
+
+    def nativeImageDockerParams = T {
       buildHelperImage()
       Some(
         NativeImage.linuxStaticParams(
@@ -121,6 +134,7 @@ object `java-class-name` extends JavaClassNameModule with JavaMainClassNativeIma
         )
       )
     }
+
     def writeNativeImageScript(scriptDest: String, imageDest: String = "") = T.command {
       buildHelperImage()
       super.writeNativeImageScript(scriptDest, imageDest)()
@@ -129,9 +143,10 @@ object `java-class-name` extends JavaClassNameModule with JavaMainClassNativeIma
 
   object `mostly-static` extends JavaMainClassNativeImage {
     def nameSuffix = "-mostly-static"
-    def nativeImageClassPath = T{
+    def nativeImageClassPath = T {
       `java-class-name`.nativeImageClassPath()
     }
+
     def nativeImageDockerParams = Some(
       NativeImage.linuxMostlyStaticParams(
         "ubuntu:18.04", // TODO Pin that?
@@ -148,18 +163,23 @@ object `java-class-name-tests` extends JavaClassNameModule with SbtModule {
       ivy"com.lihaoyi::os-lib:${Versions.osLib}",
       ivy"com.lihaoyi::utest:${Versions.uTest}"
     )
+
     def testFramework = "utest.runner.Framework"
+
     def forkEnv = super.forkEnv() ++ Seq(
       "JAVA_CLASS_NAME_CLI" -> launcher().path.toString
     )
   }
+
   object test extends Tests {
     def launcher = `java-class-name`.nativeImage()
   }
+
   object static extends Tests {
     def sources = T.sources(`java-class-name-tests`.test.sources())
     def launcher = `java-class-name`.static.nativeImage()
   }
+
   object `mostly-static` extends Tests {
     def sources = T.sources(`java-class-name-tests`.test.sources())
     def launcher = `java-class-name`.`mostly-static`.nativeImage()
@@ -190,8 +210,11 @@ def publishVersion0 = T {
 
 def ghOrg = "VirtusLab"
 def ghName = "java-class-name"
+
 trait JavaClassNamePublishModule extends PublishModule {
+
   import mill.scalalib.publish._
+
   def pomSettings = PomSettings(
     description = artifactName(),
     organization = "org.virtuslab.scala-cli.java-class-name",
@@ -213,6 +236,7 @@ trait JavaClassNamePublishModule extends PublishModule {
       )
     )
   )
+
   def publishVersion =
     publishVersion0()
 }
@@ -226,9 +250,9 @@ object ci extends Module {
   }
 
   private def publishSonatype0(
-      data: Seq[PublishModule.PublishData],
-      log: mill.api.Logger
-  ): Unit = {
+                                data: Seq[PublishModule.PublishData],
+                                log: mill.api.Logger
+                              ): Unit = {
 
     val credentials = sys.env("SONATYPE_USERNAME") + ":" + sys.env("SONATYPE_PASSWORD")
     val pgpPassword = sys.env("PGP_PASSWORD")