Rebootstrap on 0.12.5 (#4220)

Author: lihaoyi

.config/mill-version

@@ -1,2 +1,2 @@
-0.12.4-23-2ff492
+0.12.5
 

.github/workflows/run-tests.yml

@@ -169,4 +169,4 @@ jobs:
     uses: ./.github/workflows/post-build-raw.yml
     with:
       java-version: '17'
-      buildcmd: ./mill -i mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll __.sources + __.mimaReportBinaryIssues + __.fix --check + mill.javalib.palantirformat.PalantirFormatModule/ --check + mill.kotlinlib.ktlint.KtlintModule/checkFormatAll --check
+      buildcmd: ./mill -i mill.scalalib.scalafmt.ScalafmtModule/checkFormatAll __.sources + __.mimaReportBinaryIssues + __.fix --check + mill.javalib.palantirformat.PalantirFormatModule/ --check + mill.kotlinlib.ktlint.KtlintModule/checkFormatAll

build.mill

@@ -38,11 +38,11 @@ object Settings {
   )
   val docTags: Seq[String] = Seq(
     "0.11.13",
-    "0.12.4"
+    "0.12.5"
   )
   val mimaBaseVersions: Seq[String] =
     0.to(13).map("0.11." + _) ++
-    Seq("0.12.0", "0.12.1", "0.12.2", "0.12.3", "0.12.4")
+    Seq("0.12.0", "0.12.1", "0.12.2", "0.12.3", "0.12.4", "0.12.5")
 }
 
 object Deps {

contrib/proguard/src/mill/contrib/proguard/Proguard.scala

@@ -76,7 +76,7 @@ trait Proguard extends ScalaModule {
   def libraryJars: T[Seq[PathRef]] = Task {
     val javaJars =
       os.list(javaHome().path / "lib", sort = false).filter(_.ext == "jar").toSeq.map(PathRef(_))
-    javaJars ++ java9RtJar()
+    javaJars
   }
 
   /**
@@ -96,7 +96,10 @@ trait Proguard extends ScalaModule {
       "-outjars",
       outJar,
       "-libraryjars",
-      libraryJars().map(_.path).mkString(java.io.File.pathSeparator),
+      (
+        libraryJars().map(_.path) ++
+          Seq("<java.home>/jmods/java.base.jmod(!**.jar;!module-info.class)")
+      ).mkString(java.io.File.pathSeparator),
       entryPoint(),
       additionalOptions()
     ).flatMap(_.value)

integration/feature/launcher-old-versions/src/LauncherOldVersionsTests.scala

@@ -16,6 +16,9 @@ class LauncherOldVersionsTests(version: String) extends UtestIntegrationTestSuit
       val launcherScript = sys.env(launcherEnv)
       os.write.over(workspacePath / ".mill-version", version)
 
+      // Remove `rt.jar` cache to make sure each old version can download it properly
+      os.remove.all(os.home / ".mill/ammonite")
+
       // Run Mill once beforehand just to make sure it gets initialized and
       // none of the initialization output gets into `outText`
       os.call(cmd = (launcherScript, "version"), cwd = workspacePath, stderr = os.Pipe)
@@ -38,6 +41,6 @@ class LauncherOldVersionsTests(version: String) extends UtestIntegrationTestSuit
 //object LauncherVersionTests_0_6 extends LauncherOldVersionsTests("0.6.3")
 //object LauncherVersionTests_0_7 extends LauncherOldVersionsTests("0.7.4")
 //object LauncherVersionTests_0_8 extends LauncherOldVersionsTests("0.8.0")
-object LauncherVersionTests_0_9 extends LauncherOldVersionsTests("0.9.12")
-object LauncherVersionTests_0_10 extends LauncherOldVersionsTests("0.10.15")
+//object LauncherVersionTests_0_9 extends LauncherOldVersionsTests("0.9.12")
+//object LauncherVersionTests_0_10 extends LauncherOldVersionsTests("0.10.15")
 object LauncherVersionTests_0_11 extends LauncherOldVersionsTests("0.11.13")