Bump mill to 0.12 (#3691)

* Bump `mill` to 0.12.14

Co-authored-by: Lorenzo Gabriele <[email protected]>

* Bump `mill-scalafix` to 0.5.1 & apply `RemoveUnused` in Scala 3 modules

Co-authored-by: Lorenzo Gabriele <[email protected]>

* Migrate from deprecated syntax from Mill <0.12

* Apply suggestions from code review

Co-authored-by: Tomasz Godzik <[email protected]>

---------

Co-authored-by: Lorenzo Gabriele <[email protected]>
Co-authored-by: Tomasz Godzik <[email protected]>

Author: 3 people

.github/scripts/build-linux-aarch64-from-docker.sh

@@ -12,7 +12,7 @@ eval "$(cs java --env --jvm temurin:17 --jvm-index https://github.com/coursier/j
 git config --global --add safe.directory "$(pwd)"
 
 ./mill -i show 'cli[]'.nativeImage
-./mill -i copyDefaultLauncher ./artifacts
+./mill -i copyDefaultLauncher --directory ./artifacts
 if "true" == $(./mill -i ci.shouldPublish); then
   .github/scripts/generate-os-packages.sh
 fi

.github/scripts/check-cross-version-deps.sc

@@ -10,12 +10,13 @@ val modules =
 
 for { module <- modules } {
   println(s"Checking for $module...")
-  val depRegex            = "[│└─\\S\\s]+\\s([\\w.-]+):([\\w.-]+):([\\w\\s\\S.-]+)".r
+  val depRegex            = "\\[\\d+]\\s+[│└├─\\S\\s]+\\s([\\w.-]+):([\\w.-]+):([\\w\\s\\S.-]+)".r
   val scalaDepSuffixRegex = "^(.+?)(_[23](?:\\.\\d{2})?)?$".r
   val deps = os.proc(os.pwd / "mill", "-i", s"$module.ivyDepsTree")
     .call(cwd = os.pwd)
     .out
     .lines()
+    .filter(_.count(_ == ':') == 2)
     .map { case depRegex(org, name, depVersion) => (org, name, depVersion) }
   val scalaVersionsByOrgAndName = deps
     .groupBy { case (org, scalaDepSuffixRegex(nameWithoutSuffix, _), _) =>

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

@@ -5,7 +5,7 @@ ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
 WORKDIR="$ROOT/out/docker-workdir"
 
 mkdir -p "$WORKDIR"
-./mill -i copyTo 'cli[]'.nativeImageStatic "$WORKDIR/scala-cli" 1>&2
+./mill -i copyTo --task 'cli[]'.nativeImageStatic --dest "$WORKDIR/scala-cli" 1>&2
 
 cd "$WORKDIR"
 docker build -t scala-cli -f "$ROOT/.github/scripts/docker/ScalaCliDockerFile" .

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

@@ -19,7 +19,7 @@ if [[ "$OSTYPE" == "msys" || "$OSTYPE" == "cygwin" ]]; then
   MAX_RETRIES=5
   RETRY_COUNT=0
   while (( RETRY_COUNT < MAX_RETRIES )); do
-      ./mill.bat -i "$COMMAND" generate-native-image.bat
+      ./mill.bat -i "$COMMAND" --scriptDest generate-native-image.bat
 
       if [[ $? -ne 0 ]]; then
           echo "Error occurred during 'mill.bat -i $COMMAND generate-native-image.bat' command. Retrying... ($((RETRY_COUNT + 1))/$MAX_RETRIES)"

.github/scripts/generate-os-packages.sh

@@ -34,17 +34,17 @@ launcher() {
     launcherName="scala"
   fi
 
-  "$mill" -i copyTo "$launcherMillCommand" "$launcherName" 1>&2
+  "$mill" -i copyTo --task "$launcherMillCommand" --dest "$launcherName" 1>&2
   echo "$launcherName"
 }
 
 version() {
-  "$mill" -i writePackageVersionTo scala-cli-version 1>&2
+  "$mill" -i writePackageVersionTo --dest scala-cli-version 1>&2
   cat scala-cli-version
 }
 
 shortVersion() {
-  "$mill" -i writeShortPackageVersionTo scala-cli-short-version 1>&2
+  "$mill" -i writeShortPackageVersionTo --dest scala-cli-short-version 1>&2
   cat scala-cli-short-version
 }
 
@@ -89,7 +89,7 @@ generate_msi() {
 
   # Having the MSI automatically install Visual C++ redistributable when needed,
   # see https://wixtoolset.org/documentation/manual/v3/howtos/redistributables_and_install_checks/install_vcredist.html
-  "$mill" -i ci.writeWixConfigExtra wix-visual-cpp-redist.xml
+  "$mill" -i ci.writeWixConfigExtra --dest wix-visual-cpp-redist.xml
 
   packager \
     --msi \

.github/scripts/generate-slim-docker-image.sh

@@ -5,7 +5,7 @@ ROOT="$(cd "$(dirname "$0")/../.." && pwd)"
 WORKDIR="$ROOT/out/docker-slim-workdir"
 
 mkdir -p "$WORKDIR"
-./mill -i copyTo 'cli[]'.nativeImageMostlyStatic "$WORKDIR/scala-cli" 1>&2
+./mill -i copyTo --task 'cli[]'.nativeImageMostlyStatic --dest "$WORKDIR/scala-cli" 1>&2
 
 cd "$WORKDIR"
 docker build -t scala-cli-slim -f "$ROOT/.github/scripts/docker/ScalaCliSlimDockerFile" .

.github/scripts/publish-sdkman.sh

@@ -10,7 +10,7 @@
 set -eu
 
 version() {
-  "./mill" -i writePackageVersionTo scala-cli-version 1>&2
+  "./mill" -i writePackageVersionTo --dest scala-cli-version 1>&2
   cat scala-cli-version
 }
 

.github/workflows/ci.yml

@@ -25,10 +25,10 @@ jobs:
       with:
         jvm: "temurin:17"
     - name: Copy launcher
-      run: ./mill -i copyJvmLauncher artifacts/
+      run: ./mill -i copyJvmLauncher --directory artifacts/
       if: runner.os == 'Linux'
     - name: Copy bootstrapped launcher
-      run: ./mill -i copyJvmBootstrappedLauncher artifacts/
+      run: ./mill -i copyJvmBootstrappedLauncher --directory artifacts/
       if: runner.os == 'Linux'
     - uses: actions/upload-artifact@v4
       if: runner.os == 'Linux'
@@ -217,7 +217,7 @@ jobs:
       if: env.SHOULD_PUBLISH == 'true'
       run: .github/scripts/generate-os-packages.sh
     - name: Copy artifacts
-      run: ./mill -i copyDefaultLauncher artifacts/
+      run: ./mill -i copyDefaultLauncher --directory artifacts/
     - uses: actions/upload-artifact@v4
       with:
         name: linux-launchers
@@ -433,7 +433,7 @@ jobs:
       if: env.SHOULD_PUBLISH == 'true'
       run: .github/scripts/generate-os-packages.sh
     - name: Copy artifacts
-      run: ./mill -i copyDefaultLauncher artifacts/
+      run: ./mill -i copyDefaultLauncher --directory artifacts/
     - uses: actions/upload-artifact@v4
       with:
         name: macos-launchers
@@ -636,7 +636,7 @@ jobs:
         if: env.SHOULD_PUBLISH == 'true'
         run: .github/scripts/generate-os-packages.sh
       - name: Copy artifacts
-        run: ./mill -i copyDefaultLauncher artifacts/
+        run: ./mill -i copyDefaultLauncher --directory artifacts/
       - uses: actions/upload-artifact@v4
         with:
           name: macos-m1-launchers
@@ -842,7 +842,7 @@ jobs:
       run: .github/scripts/generate-os-packages.sh
       shell: bash
     - name: Copy artifacts
-      run: ./mill -i copyDefaultLauncher artifacts/
+      run: ./mill -i copyDefaultLauncher --directory artifacts/
     - uses: actions/upload-artifact@v4
       with:
         name: windows-launchers
@@ -1070,7 +1070,7 @@ jobs:
       run: .github/scripts/generate-native-image.sh mostly-static
       shell: bash
     - name: Copy artifacts
-      run: ./mill -i copyMostlyStaticLauncher artifacts/
+      run: ./mill -i copyMostlyStaticLauncher --directory artifacts/
     - uses: actions/upload-artifact@v4
       with:
         name: mostly-static-launchers
@@ -1273,7 +1273,7 @@ jobs:
       run: .github/scripts/generate-native-image.sh static
       shell: bash
     - name: Copy artifacts
-      run: ./mill -i copyStaticLauncher artifacts/
+      run: ./mill -i copyStaticLauncher --directory artifacts/
     - uses: actions/upload-artifact@v4
       with:
         name: static-launchers
@@ -1570,7 +1570,7 @@ jobs:
     - name: Java Home
       run: echo "$JAVA_HOME"
     - name: Build Scala CLI
-      run: ./mill copyJvmLauncher build
+      run: ./mill copyJvmLauncher --directory build
     - name: Build Benchmark
       run: java -jar ./build/scala-cli --power package --standalone gcbenchmark/gcbenchmark.scala -o gc
     - name: Run Benchmark

.mill-version

@@ -1 +1 @@
-0.11.13
+0.12.14

.scalafix.legacy.conf

@@ -0,0 +1,25 @@
+# Same as .scalafix3.conf, but targets Scala2
+rules  = [
+  DisableSyntax,
+  # RemoveUnused,
+  OrganizeImports,
+  NoValInForComprehension,
+  # ProcedureSyntax
+]
+DisableSyntax.noFinalize = true
+DisableSyntax.noIsInstanceOf = true
+DisableSyntax.noReturns = true
+
+// `rules` on compilation
+triggered.rules = [
+  DisableSyntax
+]
+
+OrganizeImports {
+  coalesceToWildcardImportThreshold = 6
+  expandRelative = true
+  groups = ["*", "re:javax?\\.", "scala."]
+  groupedImports = AggressiveMerge
+  removeUnused = false # added for Scala 3
+  targetDialect = Scala2
+}