Rebootstrap on main branch targeting 0.13.x (#4848)

Author: lihaoyi

.config/mill-version

@@ -1 +1 @@
-0.12.10-3-7afdee-native
+0.13.0-M0-222-c61593-native

.github/actions/pre-build-setup/action.yml

@@ -52,9 +52,9 @@ runs:
     - run: cat .mill-jvm-version
       shell: bash
 
-    - run: ./mill -i -k selective.prepare ${{ inputs.prepareargs }}
-      if: ${{ (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-all-tests')) || github.repository != 'com-lihaoyi/mill' }}
-      shell: ${{ inputs.shell }}
+#    - run: ./mill -i -k selective.prepare ${{ inputs.prepareargs }}
+#      if: ${{ (github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'run-all-tests')) || github.repository != 'com-lihaoyi/mill' }}
+#      shell: ${{ inputs.shell }}
 
     - uses: actions/upload-artifact@v4.6.0
       with:

.github/workflows/autofix.yml

@@ -10,7 +10,6 @@ jobs:
       - uses: sbt/setup-sbt@v1
 
       - run: |
-          ./mill __.fix + mill.javalib.palantirformat.PalantirFormatModule/ + mill.scalalib.scalafmt.ScalafmtModule/ + mill.kotlinlib.ktlint.KtlintModule/
-          ./mill --meta-level 1 mill.scalalib.scalafmt.ScalafmtModule/
+          ./mill __.fix + mill.javalib.palantirformat.PalantirFormatModule/ + mill.scalalib.scalafmt.ScalafmtModule/scalafmt + mill.kotlinlib.ktlint.KtlintModule/
 
       - uses: autofix-ci/action@551dded8c6cc8a1054039c8bc0b8b48c51dfc6ef

.github/workflows/pre-build.yml

@@ -32,7 +32,7 @@ jobs:
           java-version: ${{ inputs.java-version }}
           shell: ${{ inputs.shell }}
 
-      - run: ./mill -i -k ${{ inputs.compileargs }}
+      #- run: ./mill -i -k ${{ inputs.compileargs }}
 
       - uses: actions/upload-artifact@v4.6.2
         with:

.github/workflows/run-tests.yml

@@ -91,15 +91,15 @@ jobs:
           # Run these with Mill native launcher as a smoketest
         include:
           - os: ubuntu-24.04-arm
-            millargs: "'example.thirdparty[fansi].native.server.test'"
+            millargs: "'example.thirdparty[fansi].native.server'"
             java-version: 17
 
           - os: macos-latest
-            millargs: "'example.thirdparty[acyclic].native.server.test'"
+            millargs: "'example.thirdparty[acyclic].native.server'"
             java-version: 11
 
           - os: macos-13
-            millargs: "'example.thirdparty[jimfs].native.server.test'"
+            millargs: "'example.thirdparty[jimfs].native.server'"
             java-version: 11
     steps:
       - uses: actions/checkout@v4
@@ -150,78 +150,78 @@ jobs:
             install-sbt: false
 
           - java-version: 17
-            millargs: "example.javalib.__.local.server.test"
+            millargs: "example.javalib.__.local.server"
             install-android-sdk: false
             install-sbt: false
 
           - java-version: 17
-            millargs: "example.kotlinlib.__.local.server.test"
+            millargs: "example.kotlinlib.__.local.server"
             install-android-sdk: false
             install-sbt: false
 
           # Run this one using `.native` as a smoketest. Also make sure the java-version
           # is the same as that used in the `build-linux` job to avoid diverging code
           # hashes (https://github.com/com-lihaoyi/mill/pull/4410)
           - java-version: 11
-            millargs: "example.scalalib.__.native.server.test"
+            millargs: "example.scalalib.__.native.server"
             install-android-sdk: false
             install-sbt: false
 
           - java-version: 17
-            millargs: "'example.android.__.local.server.test'"
+            millargs: "'example.android.__.local.server'"
             install-android-sdk: true
             install-sbt: false
 
           - java-version: 17
-            millargs: "'{example,integration}.migrating.__.local.server.test'"
+            millargs: "'{example,integration}.migrating.__.local.server'"
             install-android-sdk: false
             install-sbt: true
 
           - java-version: 17
-            millargs: "'example.{pythonlib,javascriptlib}.__.local.server.test'"
+            millargs: "'example.{pythonlib,javascriptlib}.__.local.server'"
             install-android-sdk: false
             install-sbt: false
 
           - java-version: 11
-            millargs: "'example.thirdparty[{mockito,commons-io}].local.server.test'"
+            millargs: "'example.thirdparty[{mockito,commons-io}].local.server'"
             install-android-sdk: false
             install-sbt: false
 
           - java-version: 17
-            millargs: "'example.thirdparty[{netty,gatling}].local.server.test'"
+            millargs: "'example.thirdparty[{netty,gatling}].local.server'"
             install-android-sdk: false
             install-sbt: false
 
           - java-version: '17'
-            millargs: "'example.thirdparty[arrow].local.server.test'"
+            millargs: "'example.thirdparty[arrow].local.server'"
             install-android-sdk: false
             install-sbt: false
 
           - java-version: 11
-            millargs: "'example.{cli,fundamentals,depth,extending}.__.local.server.test'"
+            millargs: "'example.{cli,fundamentals,depth,extending}.__.local.server'"
             install-android-sdk: false
             install-sbt: false
 
           - java-version: 11
-            millargs: "'integration.{failure,feature,ide}.__.packaged.server.test'"
+            millargs: "'integration.{failure,feature,ide}.__.packaged.server'"
             install-android-sdk: false
             install-sbt: false
 
             # run this specifically in `native` mode to make sure our non-JVM native image
             # launcher is able to bootstrap everything necessary without a JVM installed
           - java-version: 17
-            millargs: "'integration.bootstrap[no-java-bootstrap].native.server.test'"
+            millargs: "'integration.bootstrap[no-java-bootstrap].native.server'"
             install-android-sdk: false
 
             # These invalidation tests need to be exercised in both execution modes
             # to make sure they work with and without -i/--no-server being passed
           - java-version: 17
-            millargs: "'integration.invalidation.__.packaged.fork.test'"
+            millargs: "'integration.invalidation.__.packaged.fork'"
             install-android-sdk: false
             install-sbt: false
 
           - java-version: 17
-            millargs: "'integration.invalidation.__.packaged.server.test'"
+            millargs: "'integration.invalidation.__.packaged.server'"
             install-android-sdk: false
             install-sbt: false
 
@@ -250,23 +250,23 @@ jobs:
             install-sbt: false
 
           - java-version: 11
-            millargs: '"example.scalalib.{basic,publishing}.__.local.fork.test"'
+            millargs: '"example.scalalib.{basic,publishing}.__.local.fork"'
             install-sbt: false
 
           - java-version: 11
-            millargs: '"example.migrating.{scalalib,javalib}.__.local.fork.test"'
+            millargs: '"example.migrating.{scalalib,javalib}.__.local.fork"'
             install-sbt: true
 
           - java-version: 17
-            millargs: "'integration.{feature,failure}.__.packaged.fork.test'"
+            millargs: "'integration.{feature,failure}.__.packaged.fork'"
             install-sbt: false
 
           - java-version: 11 # Run this with Mill native launcher as a smoketest
-            millargs: "'integration.invalidation.__.native.server.test'"
+            millargs: "'integration.invalidation.__.native.server'"
             install-sbt: false
 
           - java-version: 17
-            millargs: "'integration.bootstrap[no-java-bootstrap].native.server.test'"
+            millargs: "'integration.bootstrap[no-java-bootstrap].native.server'"
 
     uses: ./.github/workflows/post-build-selective.yml
     with:
@@ -305,5 +305,4 @@ jobs:
       java-version: '17'
       buildcmd: |
         set -eux
-        ./mill -i mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll + __.mimaReportBinaryIssues + __.fix --check + mill.javalib.palantirformat.PalantirFormatModule/ --check + mill.kotlinlib.ktlint.KtlintModule/checkFormatAll
-        ./mill -i --meta-level 1 mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll
+        ./mill -i mill.scalalib.scalafmt.ScalafmtModule/scalafmt --check + __.fix --check + mill.javalib.palantirformat.PalantirFormatModule/ --check + mill.kotlinlib.ktlint.KtlintModule/checkFormatAll

build.mill

@@ -1,10 +1,10 @@
 package build
 // imports
-import com.github.lolgab.mill.mima.Mima
+//import com.github.lolgab.mill.mima.Mima
 import coursier.maven.MavenRepository
 import coursier.VersionConstraint
-import de.tobiasroeser.mill.vcs.version.VcsVersion
-import com.goyeau.mill.scalafix.ScalafixModule
+import mill.main.VcsVersion
+//import com.goyeau.mill.scalafix.ScalafixModule
 import mill._
 import mill.define.NamedTask
 import mill.main.Tasks
@@ -475,7 +475,7 @@ trait MillPublishJavaModule extends MillJavaModule with PublishModule {
 /**
  * Some custom scala settings and test convenience
  */
-trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModule { outer =>
+trait MillScalaModule extends ScalaModule with MillJavaModule /* with ScalafixModule*/ { outer =>
   def scalaVersion = Deps.scalaVersion
   def scalapVersion: T[String] = Deps.scala2Version
   def scalafixScalaBinaryVersion = T {
@@ -532,22 +532,22 @@ trait MillScalaModule extends ScalaModule with MillJavaModule with ScalafixModul
     val binaryVersion = JvmWorkerUtil.scalaBinaryVersion(sv)
     val hasModuleDefs = binaryVersion == "2.13" || binaryVersion == "3"
     super.scalacPluginIvyDeps() ++
-      Agg.when(binaryVersion != "3")(Deps.acyclic) ++
-      Agg.when(hasModuleDefs)(Deps.millModuledefsPlugin)
+      Option.when(binaryVersion != "3")(Deps.acyclic) ++
+      Option.when(hasModuleDefs)(Deps.millModuledefsPlugin)
   }
 
   def mandatoryIvyDeps = T {
     val sv = scalaVersion()
     val binaryVersion = JvmWorkerUtil.scalaBinaryVersion(sv)
     val hasModuleDefs = binaryVersion == "2.13" || binaryVersion == "3"
     super.mandatoryIvyDeps() ++
-      Agg.when(hasModuleDefs)(Deps.millModuledefs)
+      Option.when(hasModuleDefs)(Deps.millModuledefs)
   }
 
   /** Default tests module. */
   lazy val test: MillScalaTests = new MillScalaTests {}
   trait MillScalaTests extends ScalaTests with MillJavaModule with MillBaseTestsModule
-      with ScalafixModule {
+      /*with ScalafixModule*/ {
     def scalafixConfig = T { Some(T.workspace / ".scalafix.conf") }
     def forkArgs = super.forkArgs() ++ outer.testArgs()
     def moduleDeps = outer.testModuleDeps
@@ -589,7 +589,8 @@ trait MillBaseTestsModule extends TestModule {
 trait MillPublishScalaModule extends MillScalaModule with MillPublishJavaModule
 
 /** Publishable module which contains strictly handled API. */
-trait MillStableScalaModule extends MillPublishScalaModule with Mima {
+trait MillStableScalaModule extends MillPublishScalaModule /*with Mima*/ {
+  /*
   import com.github.lolgab.mill.mima._
 //  override def mimaBinaryIssueFilters: T[Seq[ProblemFilter]] = Seq()
 
@@ -623,7 +624,7 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima {
   def skipPreviousVersions: T[Seq[String]] = T {
     T.log.info("Skipping mima for previous versions (!!1000s of errors due to Scala 3)")
     mimaPreviousVersions() // T(Seq.empty[String])
-  }
+  }*/
 }
 
 trait MillPublishCrossScalaModule extends MillPublishJavaModule with CrossScalaModule