merge

Author: lihaoyi

.editorconfig

@@ -21,6 +21,9 @@ ktlint_standard_no-wildcard-imports = disabled
 [example/kotlinlib/linting/**/*]
 ktlint = disabled
 
+[example/kotlinlib/config/3-linting/**/*]
+ktlint = disabled
+
 [kotlinlib/test/resources/contrib/ktfmt/**/*]
 ktlint = disabled
 

.github/actions/post-build-selective/action.yml

@@ -4,6 +4,10 @@ inputs:
     default: ''
     type: string
 
+  extra:
+    default: ''
+    type: string
+
   shell:
     required: true
     type: string
@@ -43,7 +47,7 @@ runs:
     #- run: ./mill -i -k selective.resolveChanged ${{ inputs.millargs }}
     #  shell: ${{ inputs.shell }}
 
-    - run: ./mill -i -k selective.run ${{ inputs.millargs }}
+    - run: ./mill -i -k ${{ inputs.extra }} selective.run ${{ inputs.millargs }}
       shell: ${{ inputs.shell }}
 
     - name: Clean-up Test Reports

.github/workflows/post-build-selective.yml

@@ -16,6 +16,9 @@ on:
       os:
         default: 'ubuntu-latest'
         type: string
+      extra:
+        default: ''
+        type: string
       timeout-minutes:
         default: 60
         type: number
@@ -63,4 +66,5 @@ jobs:
 
         with:
           millargs: ${{ inputs.millargs }}
-          shell: ${{ inputs.shell }}
+          shell: ${{ inputs.shell }}
+          extra: ${{ inputs.extra }}

.github/workflows/run-tests.yml

@@ -147,7 +147,7 @@ jobs:
           - java-version: 11
             millargs: "example.scalalib.__.local.daemon"
 
-          - java-version: 17
+          - java-version: 21
             millargs: "example.javalib.__.local.daemon"
 
           - java-version: 17
@@ -165,10 +165,10 @@ jobs:
           - java-version: 24
             millargs: "'example.{pythonlib,javascriptlib}.__.local.daemon'"
 
-          - java-version: 17
+          - java-version: 21
             millargs: "'example.{cli,fundamentals,depth,extending,large}.__.local.daemon'"
 
-          - java-version: 17.0.16
+          - java-version: 21
             millargs: "'integration.{feature,ide}.__.packaged.daemon'"
 
             # run this specifically in `native` mode to make sure our non-JVM native image
@@ -204,8 +204,9 @@ jobs:
             millargs: "'integration.invalidation.__.packaged.daemon'"
 
           - java-version: 11
+            # turn of parallelism since it sometimes causes issues with concurrent migrations
             millargs: '"example.migrating.javalib.__.packaged.daemon"'
-
+            extra: "--jobs=1"
           - java-version: 11
             millargs: '"libs.{util,javalib,androidlib,graphviz}.__.test"'
 
@@ -223,6 +224,7 @@ jobs:
       os: windows-latest
       java-version: ${{ matrix.java-version }}
       millargs: ${{ matrix.millargs }}
+      extra: ${{ matrix.extra || '' }}
       shell: powershell
 
   itest:

.mill-jvm-version

@@ -1 +1 @@
-zulu:17.0.16
+zulu:21

.scalafmt.conf

@@ -26,9 +26,13 @@ project {
     "glob:**/mill/out/**",
     # don't try to format files that are purposefully malformed / misformatted
     "glob:**/example/scalalib/linting/1-scalafmt/src/Foo.scala",
+    "glob:**/example/scalalib/config/3-linting/src/Foo.scala",
     "glob:**/example/**/*-spotless*/**",
     "glob:**/javalib/test/resources/checkstyle/**",
     "glob:**/init/test/resources/giter8/hello.g8/src/main/g8/build.mill",
+    "glob:**/init/gradle/test/resources/**",
+    "glob:**/init/maven/test/resources/**",
+    "glob:**/init/sbt/test/resources/**",
     "glob:**/javalib/test/resources/javalib/palantirformat/**",
     "glob:**/integration/failure/parse-error/**",
     "glob:**/testkit/test/resources/example-test-example-project/build.mill",

build.mill

@@ -1,4 +1,4 @@
-//| mill-version: 1.0.5-15-2cc69d
+//| mill-version: 1.0.6-46-c0a7df
 //| mill-jvm-opts: ["-XX:NonProfiledCodeHeapSize=250m", "-XX:ReservedCodeCacheSize=500m"]
 //| mill-opts: ["--jobs=0.5C"]
 
@@ -26,7 +26,7 @@ import scala.util.Properties
 import mill.api.BuildCtx
 import mill.androidlib.AndroidSdkModule
 
-def millVersionIsStable0(implicit ctx: mill.api.TaskCtx) = ctx.env.contains("MILL_STABLE_VERSION")
+def millVersionIsStable0(using ctx: mill.api.TaskCtx) = ctx.env.contains("MILL_STABLE_VERSION")
 def millVersionIsStable: T[Boolean] = Task.Input { millVersionIsStable0 }
 
 def millVersion: T[String] = Task.Input {
@@ -74,7 +74,10 @@ def millBinPlatform: T[String] = Task {
   }
 }
 
-def millJvmVersion = Task.Source(BuildCtx.workspaceRoot / "default-mill-jvm-version")
+def defaultMillJvmVersion0 = Task.Source(BuildCtx.workspaceRoot / "default-mill-jvm-version")
+def defaultMillJvmVersion = Task {
+  os.read(defaultMillJvmVersion0().path).trim()
+}
 
 val essentialBridgeScalaVersions =
   Seq(Deps.scalaVersion, Deps.scala2Version, Deps.workerScalaVersion212)
@@ -180,7 +183,7 @@ def formatDep(dep: Dep) = {
   s"${d.module.organization.value}:${d.module.name.value}:${d.versionConstraint.asString}"
 }
 
-def listCross(implicit ctx: mill.api.ModuleCtx) = BuildCtx.watchValue {
+def listCross(using ctx: mill.api.ModuleCtx) = BuildCtx.watchValue {
   // millSourcePath is protected, so we need to access it via reflection
   import scala.reflect.Selectable.reflectiveSelectable
   os.list(ctx.asInstanceOf[{ def millSourcePath: os.Path }].millSourcePath).map(_.last)

changelog.adoc

@@ -13,11 +13,27 @@ _The changelog below is for tagged, stable releases. For unstable releases,
 see the list at https://repo1.maven.org/maven2/com/lihaoyi/mill-dist_
 
 
+[#1-0-6]
+=== 1.0.6
+:version: 1.0.6
+:milestone-name: 1.0.6
+:milestone: 131
+:prev-version: 1.0.5
+_2025-10-01_
+
+* Support Playwright testing for Scala-JS ({link-pr}/5777[#5777])
+* Clean Linker caches when ScalaJSWorker is closed ({link-pr}/5933[#5933])
+* Fix prompt resizing when connecting to existing daemon ({link-pr}/5924[#5924])
+* Bump Scala version to 3.7.3 ({link-pr}/5897[#5897])
+* Make `--bsp` Mill process launch from `MillBspMain` class {link-pr}/5896[#5896])
+
+_Changes since {prev-version}:_
+
 [#1-0-5]
 === 1.0.5
 :version: 1.0.5
 :milestone-name: 1.0.5
-:milestone: 125
+:milestone: 130
 :prev-version: 1.0.4
 _2025-09-16_
 
@@ -52,7 +68,7 @@ _Changes since {prev-version}:_
 === 1.0.4
 :version: 1.0.4
 :milestone-name: 1.0.4
-:milestone: 124
+:milestone: 129
 :prev-version: 1.0.3
 _2025-08-27_
 
@@ -72,7 +88,7 @@ _Changes since {prev-version}:_
 === 1.0.3
 :version: 1.0.3
 :milestone-name: 1.0.3
-:milestone: 123
+:milestone: 127
 :prev-version: 1.0.2
 _2025-08-05_
 
@@ -126,7 +142,7 @@ core.resolve    This module contains logic around resolving Mill command line
 === 1.0.2
 :version: 1.0.2
 :milestone-name: 1.0.2
-:milestone: 122
+:milestone: 126
 :prev-version: 1.0.1
 _2025-07-29_
 
@@ -156,7 +172,7 @@ _Changes since {prev-version}:_
 === 1.0.1
 :version: 1.0.1
 :milestone-name: 1.0.1
-:milestone: 121
+:milestone: 125
 :prev-version: 1.0.0
 _2025-07-21_
 
@@ -177,7 +193,7 @@ _Changes since {prev-version}:_
 === 1.0.0
 :version: 1.0.0
 :milestone-name: 1.0.0
-:milestone: 121
+:milestone: 124
 :prev-version: 1.0.0-RC3
 _2025-07-10_
 
@@ -595,7 +611,7 @@ _Changes since {prev-version}:_
 === 0.12.15
 :version: 0.12.15
 :milestone-name: 0.12.15
-:milestone: 116
+:milestone: 121
 :prev-version: 0.12.14
 _2025-08-01_
 
@@ -621,7 +637,7 @@ version contains regex-sensitive characters ({link-pr}/5599[#5599])
 === 0.12.14
 :version: 0.12.14
 :milestone-name: 0.12.14
-:milestone: 116
+:milestone: 119
 :prev-version: 0.12.13
 _2025-05-20_
 
@@ -639,7 +655,7 @@ _Changes since {prev-version}:_
 === 0.12.13
 :version: 0.12.13
 :milestone-name: 0.12.13
-:milestone: 115
+:milestone: 120
 :prev-version: 0.12.11
 _2025-05-18_
 
@@ -828,7 +844,7 @@ _2025-01-31_
 
 _Changes since {prev-version}:_
 
-* https://mill-build.org/mill/cli/installation-ide.html#_mill_native_executable[Mill now provides native executables] on windows-amd64, linux-{amd64,aarch64}, and
+* https://mill-build.org/mill/cli/installation-ide.html#_mill_native_and_jvm_executables[Mill now provides native executables] on windows-amd64, linux-{amd64,aarch64}, and
 macos-{amd64,aarch64}. These can be enabled by adding the `-native` suffix to your `.mill-version`
 file (e.g. `0.12.6-native`), and allows you to run Mill on clean machines without needing
 a pre-installed JVM (Mill will instead download one as necessary)

ci/test-dist-run.sh

@@ -2,16 +2,16 @@
 
 set -eux
 
-EXAMPLE=example/scalalib/basic/6-realistic
+EXAMPLE=example/scalalib/basic/10-realistic
 
 rm -rf $EXAMPLE/out
 
-test ! -d $EXAMPLE/out/foo/3.3.3/compile.dest
+test ! -d $EXAMPLE/out/foo/3.3.6/compile.dest
 test ! -f $EXAMPLE/out/bar/2.13.16/assembly.dest/out.jar
 
-./mill -i dist.run $EXAMPLE -i "foo[3.3.3].run"
+./mill -i dist.run $EXAMPLE -i "foo[3.3.6].run"
 
-test -d $EXAMPLE/out/foo/3.3.3/compile.dest
+test -d $EXAMPLE/out/foo/3.3.6/compile.dest
 
 ./mill -i dist.run $EXAMPLE show "bar[2.13.16].assembly"
 

ci/test-mill-bootstrap.sh

@@ -23,4 +23,4 @@ rm -rf out
 
 
 # Run tests
-./mill-assembly.jar -i "example.scalalib.basic[1-simple].packaged.daemon.testForked"
+./mill-assembly.jar -i "example.scalalib.basic[3-simple].packaged.daemon.testForked"