Bump Mill to 1.0.5 (was 0.12.15)

Author: Gedochao

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

@@ -11,9 +11,9 @@ val modules =
 
 for { module <- modules } {
   println(s"Checking for $module...")
-  val depRegex            = "\\[\\d+]\\s+[│└├─\\S\\s]+\\s([\\w.-]+):([\\w.-]+):([\\w\\s\\S.-]+)".r
+  val depRegex            = "[│└├─\\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")
+  val deps                = os.proc(os.pwd / "mill", "-i", s"$module.showMvnDepsTree")
     .call(cwd = os.pwd)
     .out
     .lines()

.github/workflows/ci.yml

@@ -1536,7 +1536,7 @@ jobs:
     - name: Check native-image config format
       run: ./mill -i __.checkNativeImageConfFormat
     - name: Check Ammonite availability
-      run: ./mill -i 'dummy.amm[_].resolvedRunIvyDeps'
+      run: ./mill -i 'dummy.amm[_].resolvedRunMvnDeps'
     - name: Check for cross Scala version conflicts
       run: .github/scripts/check-cross-version-deps.sc
     - name: Scalafix check

.mill-version

@@ -1 +1 @@
-0.12.15
+1.0.5

build.mill.scala

@@ -84,7 +84,7 @@ export USE_NATIVE_IMAGE_JAVA_PLATFORM_MODULE_SYSTEM=false
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)"
 
 if [[ $IS_WINDOWS ]]; then
-  exec "$DIR/millw" "$@"
+  exec "$DIR/mill.bat" "$@"
 else
   exec "$DIR/millw" $COMMAND
 fi

mill

@@ -6,7 +6,7 @@ rem This script determines the Mill version to use by trying these sources
 rem   - env-variable `MILL_VERSION`
 rem   - local file `.mill-version`
 rem   - local file `.config/mill-version`
-rem   - `mill-version` from YAML fronmatter of current buildfile
+rem   - `mill-version` from YAML frontmatter of current buildfile
 rem   - if accessible, find the latest stable version available on Maven Central (https://repo1.maven.org/maven2)
 rem   - env-variable `DEFAULT_MILL_VERSION`
 rem
@@ -23,7 +23,7 @@ rem this script downloads a binary file from Maven Central or Github Pages (this
 rem into a cache location (%USERPROFILE%\.mill\download).
 rem
 rem Mill Project URL: https://github.com/com-lihaoyi/mill
-rem Script Version: 1.0.0-M1-21-7b6fae-DIRTY892b63e8
+rem Script Version: 1.0.5
 rem
 rem If you want to improve this script, please also contribute your changes back!
 rem This script was generated from: dist/scripts/src/mill.bat
@@ -34,7 +34,7 @@ rem setlocal seems to be unavailable on Windows 95/98/ME
 rem but I don't think we need to support them in 2019
 setlocal enabledelayedexpansion
 
-if [!DEFAULT_MILL_VERSION!]==[] ( set "DEFAULT_MILL_VERSION=0.12.15" )
+if [!DEFAULT_MILL_VERSION!]==[] ( set "DEFAULT_MILL_VERSION=1.0.5" )
 
 if [!MILL_GITHUB_RELEASE_CDN!]==[] ( set "MILL_GITHUB_RELEASE_CDN=" )
 
@@ -66,17 +66,47 @@ if [!MILL_VERSION!]==[] (
       set /p MILL_VERSION=<.config\mill-version
     ) else (
       if not "%MILL_BUILD_SCRIPT%"=="" (
-        for /f "tokens=1-2*" %%a in ('findstr /C:"//| mill-version:" %MILL_BUILD_SCRIPT%') do (
-          set "MILL_VERSION=%%c"
+        rem Find the line and process it
+        for /f "tokens=*" %%a in ('findstr /R /C:"//\|.*mill-version" "%MILL_BUILD_SCRIPT%"') do (
+            set "line=%%a"
+
+            rem --- 1. Replicate sed 's/.*://' ---
+            rem This removes everything up to and including the first colon
+            set "line=!line:*:=!"
+
+            rem --- 2. Replicate sed 's/#.*//' ---
+            rem Split on '#' and keep the first part
+            for /f "tokens=1 delims=#" %%b in ("!line!") do (
+                set "line=%%b"
+            )
+
+            rem --- 3. Replicate sed 's/['"]//g' ---
+            rem Remove all quotes
+            set "line=!line:'=!"
+            set "line=!line:"=!"
+
+            rem --- 4. NEW: Replicate sed's trim/space removal ---
+            rem Remove all space characters from the result. This is more robust.
+            set "MILL_VERSION=!line: =!"
+
+            rem We found the version, so we can exit the loop
+            goto :version_found
         )
+
+        :version_found
+        rem no-op
       ) else (
         rem no-op
       )
     )
   )
 )
 
-if [!MILL_VERSION!]==[] set MILL_VERSION=%DEFAULT_MILL_VERSION%
+if [!MILL_VERSION!]==[] (
+    echo No mill version specified. >&2
+    echo You should provide a version via a '//^| mill-version: ' comment or a '.mill-version' file. >&2
+    set MILL_VERSION=%DEFAULT_MILL_VERSION%
+)
 
 if [!MILL_DOWNLOAD_PATH!]==[] set MILL_DOWNLOAD_PATH=%USERPROFILE%\.mill\download
 

mill.bat

@@ -6,7 +6,7 @@
 #   - env-variable `MILL_VERSION`
 #   - local file `.mill-version`
 #   - local file `.config/mill-version`
-#   - `mill-version` from YAML fronmatter of current buildfile
+#   - `mill-version` from YAML frontmatter of current buildfile
 #   - if accessible, find the latest stable version available on Maven Central (https://repo1.maven.org/maven2)
 #   - env-variable `DEFAULT_MILL_VERSION`
 #
@@ -23,7 +23,7 @@
 # into a cache location (~/.cache/mill/download).
 #
 # Mill Project URL: https://github.com/com-lihaoyi/mill
-# Script Version: 1.0.0-M1-21-7b6fae-DIRTY892b63e8
+# Script Version: 1.0.5
 #
 # If you want to improve this script, please also contribute your changes back!
 # This script was generated from: dist/scripts/src/mill.sh
@@ -32,14 +32,8 @@
 
 set -e
 
-if [ "$1" = "--setup-completions" ] ; then
-  # Need to preserve the first position of those listed options
-  MILL_FIRST_ARG=$1
-  shift
-fi
-
 if [ -z "${DEFAULT_MILL_VERSION}" ] ; then
-  DEFAULT_MILL_VERSION=0.12.15
+  DEFAULT_MILL_VERSION="1.0.5"
 fi
 
 
@@ -79,7 +73,19 @@ if [ -z "${MILL_VERSION}" ] ; then
   elif [ -f ".config/mill-version" ] ; then
     MILL_VERSION="$(tr '\r' '\n' < .config/mill-version | head -n 1 2> /dev/null)"
   elif [ -n "${MILL_BUILD_SCRIPT}" ] ; then
-    MILL_VERSION="$(cat ${MILL_BUILD_SCRIPT} | grep '//[|]  *mill-version:  *' | sed 's;//|  *mill-version:  *;;')"
+    # `s/.*://`:
+    #   This is a greedy match that removes everything from the beginning of the line up to (and including) the last
+    #   colon (:). This effectively isolates the value part of the declaration.
+    #
+    #  `s/#.*//`:
+    #    This removes any comments at the end of the line.
+    #
+    #  `s/['\"]//g`:
+    #    This removes all single and double quotes from the string, wherever they appear (g is for "global").
+    #
+    #  `s/^[[:space:]]*//; s/[[:space:]]*$//`:
+    #    These two expressions trim any leading or trailing whitespace ([[:space:]] matches spaces and tabs).
+    MILL_VERSION="$(grep -E "//\|.*mill-version" "${MILL_BUILD_SCRIPT}" | sed -E "s/.*://; s/#.*//; s/['\"]//g; s/^[[:space:]]*//; s/[[:space:]]*$//")"
   fi
 fi
 

millw

@@ -1,6 +1,8 @@
 package build.project.deps
-import mill._
-import scalalib._
+
+import mill.*
+import mill.api.BuildInfo
+import scalalib.*
 
 object Cli {
   def runnerLegacyVersion = "1.7.1" // last runner version to support pre-LTS Scala 3 versions
@@ -100,7 +102,7 @@ object TestDeps {
 
 object InternalDeps {
   object Versions {
-    def mill: String  = _root_.mill.main.BuildInfo.millVersion
+    def mill: String  = BuildInfo.millVersion
     def lefouMillwRef = "166bcdf5741de8569e0630e18c3b2ef7e252cd96"
   }
 }

project/deps/package.mill.scala

@@ -1,20 +1,20 @@
 package build.project.publish
-import $ivy.`de.tototec::de.tobiasroeser.mill.vcs.version::0.4.0`
-import $ivy.`org.eclipse.jgit:org.eclipse.jgit:7.3.0.202506031305-r`
+
 import build.project.settings
 import com.lumidion.sonatype.central.client.core.{PublishingType, SonatypeCredentials}
 import settings.{PublishLocalNoFluff, workspaceDirName}
-import de.tobiasroeser.mill.vcs.version._
-import mill._
+import mill.*
 import mill.javalib.publish.Artifact
-import scalalib._
+import mill.util.{Tasks, VcsVersion}
+import scalalib.*
 import org.eclipse.jgit.api.Git
+import mill.api.{BuildCtx, ModuleCtx, Task}
 
 import java.nio.charset.Charset
-import scala.concurrent.duration._
-import scala.jdk.CollectionConverters._
+import scala.concurrent.duration.*
+import scala.jdk.CollectionConverters.*
 
-lazy val (ghOrg: String, ghName: String) = {
+def gh: (ghOrg: String, ghName: String) = {
   def default = ("VirtusLab", "scala-cli")
   val isCI    = System.getenv("CI") != null
   if (isCI) {
@@ -62,7 +62,9 @@ lazy val (ghOrg: String, ghName: String) = {
     default
 }
 
-private def computePublishVersion(state: VcsState, simple: Boolean): String =
+lazy val (ghOrg: String, ghName: String) = gh
+
+private def computePublishVersion(state: VcsVersion.State, simple: Boolean): String =
   if (state.commitsSinceLastTag > 0)
     if (simple) {
       val versionOrEmpty = state.lastTag
@@ -141,15 +143,18 @@ trait ScalaCliPublishModule extends SonatypeCentralPublishModule with PublishLoc
   )
   override def publishVersion: T[String] = finalPublishVersion()
   override def sourceJar: T[PathRef]     = Task {
-    import mill.util.Jvm.createJar
-    val allSources0 = allSources().map(_.path).filter(os.exists).toSet
-    createJar(
-      allSources0 ++ resources().map(_.path).filter(os.exists),
-      manifest(),
-      (input, relPath) =>
-        !allSources0(input) ||
-        (!relPath.segments.contains(".scala") && !relPath.segments.contains(workspaceDirName))
-    )
+    PathRef {
+      import mill.util.Jvm.createJar
+      val allSources0 = allSources().map(_.path).filter(os.exists)
+      createJar(
+        jar = Task.dest / "out.jar",
+        inputPaths = allSources0 ++ resources().map(_.path).filter(os.exists),
+        manifest = manifest(),
+        fileFilter = (input, relPath) =>
+          !allSources0.toSet(input) ||
+          (!relPath.segments.contains(".scala") && !relPath.segments.contains(workspaceDirName))
+      )
+    }
   }
 }
 
@@ -211,7 +216,7 @@ def publishSonatype(
   publisher.publishAll(
     publishingType = publishingType,
     singleBundleName = finalBundleName,
-    artifacts = artifacts: _*
+    artifacts = artifacts*
   )
 }
 
@@ -235,7 +240,7 @@ def setShouldPublish() = Task.Command {
   val charSet = Charset.defaultCharset()
   val nl      = System.lineSeparator()
   os.write.append(
-    os.Path(envFile, Task.workspace),
+    os.Path(envFile, BuildCtx.workspaceRoot),
     s"SHOULD_PUBLISH=${shouldPublish()}$nl".getBytes(charSet)
   )
 }