Migrate from deprecated syntax from Mill <0.12

Author: Gedochao

build.mill.scala

@@ -13,12 +13,12 @@ import settings.{
   CliLaunchers,
   FormatNativeImageConf,
   HasTests,
+  Licenses,
   LocalRepo,
   PublishLocalNoFluff,
   ScalaCliCrossSbtModule,
-  ScalaCliSbtModule,
-  ScalaCliScalafixModule,
   ScalaCliScalafixLegacyModule,
+  ScalaCliScalafixModule,
   jvmPropertiesFileName,
   localRepoResourcePath,
   platformExecutableJarExtension,
@@ -31,7 +31,7 @@ import deps.alpineVersion
 import build.project.website
 import coursier.Repository
 
-import java.io.File
+import java.io.{File, InputStream}
 import java.net.URL
 import java.nio.charset.Charset
 import java.util.Locale
@@ -43,6 +43,7 @@ import scalalib.{publish => _, _}
 import mill.contrib.bloop.Bloop
 import mill.testrunner.TestResult
 import os.{CommandResult, Path}
+import upickle.default.read
 
 import _root_.scala.util.{Properties, Using}
 import _root_.scala.annotation.unused
@@ -349,8 +350,7 @@ trait BuildMacros extends ScalaCliCrossSbtModule
       val sv = scalaVersion()
       def compile(extraSources: os.Path*): CommandResult =
         os.proc("scala-cli", "compile", "-S", sv, cpsSource, extraSources).call(
-          check =
-            false,
+          check = false,
           mergeErrIntoOut = true,
           cwd = Task.workspace
         )
@@ -1136,35 +1136,6 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
     }
     def generatedSources: Target[Seq[PathRef]] = super.generatedSources() ++ Seq(constantsFile())
 
-    def runTests(
-      launcherTask: T[PathRef],
-      cliKind: String,
-      args: String*
-    ): Task[(String, Seq[TestResult])] = {
-      val argsTask = Task.Anon {
-        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
-      }
-      testTask(argsTask, Task.Anon(Seq.empty[String]))
-    }
-
     override def test(args: String*): Command[(String, Seq[TestResult])] = jvm(args: _*)
 
     def forcedLauncher: Target[PathRef] = Task(persistent = true) {
@@ -1234,16 +1205,65 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
         }
     }
 
-    def jvm(args: String*): Command[(String, Seq[TestResult])] =
-      T.command(runTests(Launchers.jvm, "jvm", args: _*))
-    def jvmBootstrapped(args: String*): Command[(String, Seq[TestResult])] =
-      T.command(runTests(Launchers.jvmBootstrapped, "jvmBootstrapped", args: _*))
-    def native(args: String*): Command[(String, Seq[TestResult])] =
-      T.command(runTests(Launchers.native, "native", args: _*))
-    def nativeStatic(args: String*): Command[(String, Seq[TestResult])] =
-      T.command(runTests(Launchers.nativeStatic, "native-static", args: _*))
-    def nativeMostlyStatic(args: String*): Command[(String, Seq[TestResult])] =
-      T.command(runTests(Launchers.nativeMostlyStatic, "native-mostly-static", args: _*))
+    private def extraTestArgs(launcher: os.Path, cliKind: String): Seq[String] =
+      Seq(
+        s"-Dtest.scala-cli.path=$launcher",
+        s"-Dtest.scala-cli.kind=$cliKind"
+      )
+
+    private def debugTestArgs(args: Seq[String]): Seq[String] = {
+      val debugReg = "^--debug$|^--debug:([0-9]+)$".r
+      val debugPortOpt = args.find(debugReg.matches).flatMap {
+        case debugReg(port) => Option(port).orElse(Some("5005"))
+        case _              => None
+      }
+      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
+      }
+    }
+
+    private def testArgs(args: Seq[String], launcher: os.Path, cliKind: String): Seq[String] =
+      extraTestArgs(launcher, cliKind) ++ debugTestArgs(args)
+
+    def jvm(args: String*): Command[(String, Seq[TestResult])] = Task.Command {
+      testTask(
+        Task.Anon(args ++ testArgs(args, Launchers.jvm().path, "jvm")),
+        Task.Anon(Seq.empty[String])
+      )()
+    }
+    def jvmBootstrapped(args: String*): Command[(String, Seq[TestResult])] = Task.Command {
+      testTask(
+        Task.Anon(args ++ testArgs(args, Launchers.jvmBootstrapped().path, "jvmBootstrapped")),
+        Task.Anon(Seq.empty[String])
+      )()
+    }
+    def native(args: String*): Command[(String, Seq[TestResult])] = Task.Command {
+      testTask(
+        Task.Anon(args ++ testArgs(args, Launchers.native().path, "native")),
+        Task.Anon(Seq.empty[String])
+      )()
+    }
+    def nativeStatic(args: String*): Command[(String, Seq[TestResult])] = Task.Command {
+      testTask(
+        Task.Anon(args ++ testArgs(args, Launchers.nativeStatic().path, "native-static")),
+        Task.Anon(Seq.empty[String])
+      )()
+    }
+    def nativeMostlyStatic(args: String*): Command[(String, Seq[TestResult])] = Task.Command {
+      testTask(
+        Task.Anon(args ++ testArgs(
+          args,
+          Launchers.nativeMostlyStatic().path,
+          "native-mostly-static"
+        )),
+        Task.Anon(Seq.empty[String])
+      )()
+    }
   }
 }
 
@@ -2053,7 +2073,3 @@ object ci extends Module {
     )
   }
 }
-
-def updateLicensesFile(): Command[Unit] = T.command {
-  settings.updateLicensesFile()
-}

project/deps/package.mill.scala

@@ -1,5 +1,4 @@
 package build.project.deps
-import Deps.Versions
 import mill._
 import scalalib._
 
@@ -193,11 +192,10 @@ object Deps {
     .exclude(("com.github.plokhotnyuk.jsoniter-scala", "jsoniter-scala-core_2.13"))
   def dependency   = ivy"io.get-coursier::dependency:0.3.2"
   def dockerClient = ivy"com.spotify:docker-client:8.16.0"
-  // TODO bump once 0.15.5 is out
-  def expecty = ivy"com.eed3si9n.expecty::expecty:0.17.0"
-  def fansi   = ivy"com.lihaoyi::fansi:0.5.0"
-  def giter8  = ivy"org.foundweekends.giter8:giter8:0.16.2"
-  def guava   = ivy"com.google.guava:guava:33.4.8-jre"
+  def expecty      = ivy"com.eed3si9n.expecty::expecty:0.17.0"
+  def fansi        = ivy"com.lihaoyi::fansi:0.5.0"
+  def giter8       = ivy"org.foundweekends.giter8:giter8:0.16.2"
+  def guava        = ivy"com.google.guava:guava:33.4.8-jre"
   def javaClassName =
     ivy"org.virtuslab.scala-cli.java-class-name:java-class-name_3:${Versions.javaClassName}"
       .exclude(
@@ -218,20 +216,18 @@ object Deps {
     ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScalaJava8}"
   def jsoniterMacrosJava8 =
     ivy"com.github.plokhotnyuk.jsoniter-scala::jsoniter-scala-macros:${Versions.jsoniterScalaJava8}"
-  def jsoup         = ivy"org.jsoup:jsoup:${Versions.jsoup}"
-  def libsodiumjni  = ivy"org.virtuslab.scala-cli:libsodiumjni:0.0.4"
-  def macroParadise = ivy"org.scalamacros:::paradise:2.1.1"
+  def jsoup        = ivy"org.jsoup:jsoup:${Versions.jsoup}"
+  def libsodiumjni = ivy"org.virtuslab.scala-cli:libsodiumjni:0.0.4"
   def metaconfigTypesafe =
     ivy"org.scalameta::metaconfig-typesafe-config:0.16.0"
       .exclude(("org.scala-lang", "scala-compiler"))
-  def munit                      = ivy"org.scalameta::munit:1.1.1"
-  def nativeTestRunner           = ivy"org.scala-native::test-runner:${Versions.scalaNative}"
-  def nativeTools                = ivy"org.scala-native::tools:${Versions.scalaNative}"
-  def osLib                      = ivy"com.lihaoyi::os-lib:0.11.3"
-  def pprint                     = ivy"com.lihaoyi::pprint:0.9.0"
-  def pythonInterface            = ivy"io.github.alexarchambault.python:interface:0.1.0"
-  def pythonNativeLibs           = ivy"ai.kien::python-native-libs:0.2.4"
-  def scala3Compiler(sv: String) = ivy"org.scala-lang:scala3-compiler_3:$sv"
+  def munit              = ivy"org.scalameta::munit:1.1.1"
+  def nativeTestRunner   = ivy"org.scala-native::test-runner:${Versions.scalaNative}"
+  def nativeTools        = ivy"org.scala-native::tools:${Versions.scalaNative}"
+  def osLib              = ivy"com.lihaoyi::os-lib:0.11.3"
+  def pprint             = ivy"com.lihaoyi::pprint:0.9.0"
+  def pythonInterface    = ivy"io.github.alexarchambault.python:interface:0.1.0"
+  def pythonNativeLibs   = ivy"ai.kien::python-native-libs:0.2.4"
   def scalaAsync         = ivy"org.scala-lang.modules::scala-async:1.0.1".exclude("*" -> "*")
   def scalac(sv: String) = ivy"org.scala-lang:scala-compiler:$sv"
   def scalafmtCli        = ivy"org.scalameta:scalafmt-cli_2.13:${Versions.scalafmt}"
@@ -285,7 +281,6 @@ object Deps {
   def toolkitTest               = ivy"org.scala-lang:toolkit-test:$toolkitVersion"
   val typelevelToolkitVersion   = "0.1.29"
   def typelevelToolkit          = ivy"org.typelevel:toolkit:$typelevelToolkitVersion"
-  def typelevelToolkitTest      = ivy"org.typelevel:toolkit-test:$typelevelToolkitVersion"
   def usingDirectives           = ivy"org.virtuslab:using_directives:1.1.4"
   // Lives at https://github.com/VirtusLab/no-crc32-zip-input-stream, see #865
   // This provides a ZipInputStream that doesn't verify CRC32 checksums, that users

project/publish/package.mill.scala

@@ -105,7 +105,7 @@ private def computePublishVersion(state: VcsState, simple: Boolean): String =
       .getOrElse(state.format())
       .stripPrefix("v")
 
-def finalPublishVersion = {
+def finalPublishVersion: Target[String] = {
   val isCI = System.getenv("CI") != null
   if (isCI)
     Task(persistent = true) {

project/settings/package.mill.scala

@@ -23,7 +23,7 @@ import mill.scalalib._
 import os.{CommandResult, Path}
 import upickle.default._
 
-import java.io.{File, InputStream}
+import java.io.File
 import java.nio.charset.StandardCharsets
 import java.util.Locale
 import scala.annotation.unused
@@ -62,7 +62,6 @@ def fromPath(name: String): String =
     name
 
 def cs: Target[String] = Task(persistent = true) {
-
   val arch      = sys.props.getOrElse("os.arch", "").toLowerCase(Locale.ROOT)
   val ext       = if (Properties.isWin) ".exe" else ""
   val csVersion = if (arch == "aarch64" && Properties.isMac) buildCsM1Version else buildCsVersion
@@ -124,19 +123,11 @@ def cs: Target[String] = Task(persistent = true) {
     }
   }
 
-  if (os.isFile(dest))
-    dest.toString
-  else
-    downloadOpt().getOrElse(fromPath("cs")): String
+  if (os.isFile(dest)) dest.toString
+  else downloadOpt().getOrElse(fromPath("cs")): String
 }
 
-def platformExtension: String =
-  if (Properties.isWin) ".exe"
-  else ""
-
-def platformExecutableJarExtension: String =
-  if (Properties.isWin) ".bat"
-  else ""
+def platformExecutableJarExtension: String = if (Properties.isWin) ".bat" else ""
 
 lazy val arch = sys.props("os.arch").toLowerCase(java.util.Locale.ROOT) match {
   case "amd64" => "x86_64"
@@ -153,12 +144,6 @@ def platformSuffix: String = {
 
 def localRepoResourcePath = "local-repo.zip"
 
-def getGhToken(): String =
-  Option(System.getenv("UPLOAD_GH_TOKEN"))
-    .getOrElse {
-      sys.error("UPLOAD_GH_TOKEN not set")
-    }
-
 trait CliLaunchers extends SbtModule { self =>
 
   def launcherTypeResourcePath: os.RelPath =
@@ -200,7 +185,7 @@ trait CliLaunchers extends SbtModule { self =>
     private def staticLibDirName = "native-libs"
 
     private def copyCsjniutilTo(cs: String, destDir: os.Path, workspace: os.Path): Unit = {
-      val jniUtilsVersion = Deps.jniUtils.dep.version
+      val jniUtilsVersion = Deps.jniUtils.dep.versionConstraint.asString
       val libRes = os.proc(
         cs,
         "fetch",
@@ -213,7 +198,7 @@ trait CliLaunchers extends SbtModule { self =>
       os.copy.over(libPath, destDir / "csjniutils.lib")
     }
     private def copyLibsodiumjniTo(cs: String, destDir: os.Path, workspace: os.Path): Unit = {
-      val libsodiumjniVersion = Deps.libsodiumjni.dep.version
+      val libsodiumjniVersion = Deps.libsodiumjni.dep.versionConstraint.asString
       val (classifier, ext) = sys.props.get("os.arch") match {
         case Some("x86_64" | "amd64") =>
           if (Properties.isWin) ("x86_64-pc-win32", "lib")
@@ -445,7 +430,7 @@ trait CliLaunchers extends SbtModule { self =>
       stdin = os.Inherit,
       stdout = os.Inherit
     )
-    Task.log.outputStream.println(s"Config generated in ${outputDir.relativeTo(Task.workspace)}")
+    Task.log.streams.out.println(s"Config generated in ${outputDir.relativeTo(Task.workspace)}")
   }
 
   @unused
@@ -595,7 +580,6 @@ trait PublishLocalNoFluff extends PublishModule {
 }
 
 trait LocalRepo extends Module {
-
   def stubsModules: Seq[PublishLocalNoFluff]
   def version: T[String]
 
@@ -615,12 +599,12 @@ trait LocalRepo extends Module {
         VcsVersion.vcsState()
       }
   def localRepoZip: Target[PathRef] = Task {
-    val repoVer   = vcsState().format()
-    val ver       = version()
-    val something = localRepo()
-    val repoDir   = Task.workspace / "out" / "repo" / ver
-    val destDir   = Task.dest / ver / "repo.zip"
-    val dest      = destDir / "repo.zip"
+    val repoVer = vcsState().format()
+    val ver     = version()
+    localRepo()
+    val repoDir = Task.workspace / "out" / "repo" / ver
+    val destDir = Task.dest / ver / "repo.zip"
+    val dest    = destDir / "repo.zip"
 
     import java.io._
     import java.util.zip._
@@ -836,7 +820,6 @@ trait ScalaCliScalafixLegacyModule extends ScalaCliScalafixModule {
 }
 
 trait ScalaCliCrossSbtModule extends CrossSbtModule with ScalaCliModule
-trait ScalaCliSbtModule      extends SbtModule with ScalaCliModule
 
 trait ScalaCliModule extends ScalaModule {
   def javacOptions: Target[Seq[String]] = super.javacOptions() ++ Seq(
@@ -865,49 +848,3 @@ case class Licenses(licenses: List[License])
 object Licenses {
   implicit val rw: ReadWriter[Licenses] = macroRW
 }
-
-def updateLicensesFile() = T.task {
-  val url             = "https://github.com/spdx/license-list-data/raw/master/json/licenses.json"
-  var is: InputStream = null
-  val b =
-    try {
-      is = new java.net.URL(url).openStream()
-      is.readAllBytes()
-    }
-    finally if (is != null) is.close()
-  val content = new String(b, "UTF-8")
-
-  val licenses = read[Licenses](content).licenses
-
-  System.err.println(s"Found ${licenses.length} licenses")
-
-  val licensesCode = licenses
-    .sortBy(_.licenseId)
-    .map { license =>
-      s"""    License("${license.licenseId}", "${license.name.replace(
-          "\"",
-          "\\\""
-        )}", "${license.reference}")"""
-    }
-    .mkString(",\n")
-
-  val genSource =
-    s"""package scala.build.internal
-       |
-       |object Licenses {
-       |  // format: off
-       |  val list = Seq(
-       |$licensesCode
-       |  )
-       |  // format: on
-       |
-       |  lazy val map = list.map(l => l.id -> l).toMap
-       |}
-       |""".stripMargin
-
-  val dest =
-    os.rel / "modules" / "build" / "src" / "main" / "scala" / "scala" / "build" / "internal" / "Licenses.scala"
-  os.write.over(Task.workspace / dest, genSource)
-
-  System.err.println(s"Wrote $dest")
-}