Clean up ci/package.mill, enforce scalafmt on build.mill/`package…

….mill` files in CI, break up `readme.adoc` (#4342)
com-lihaoyi · Jan 16, 2025 · b2111f4 · b2111f4
1 parent db05eaa
commit b2111f4
Show file tree

Hide file tree

Showing 20 changed files with 3,065 additions and 3,019 deletions.
diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -220,4 +220,7 @@ 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
+      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
diff --git a/build.mill b/build.mill
@@ -16,8 +16,7 @@ import mill.define.Cross
 
 // plugins and dependencies
 import $meta._
-import $file.ci.shared
-import $file.ci.upload
+
 import $packages._
 
 object Settings {
@@ -271,8 +270,7 @@ def millVersion: T[String] = Task.Input {
     // Ignore local changes when computing the VCS version string,
     // since we make those in CI and can promise they are safe
     VcsVersion.calcVcsState(Task.log).copy(dirtyHash = None).format()
-  }
-  else "SNAPSHOT"
+  } else "SNAPSHOT"
 }
 
 def millLastTag: T[String] = Task {
@@ -596,8 +594,12 @@ trait MillStableScalaModule extends MillPublishScalaModule with Mima {
     ),
 
     // Overrides added for new methods, ought to be safe
-    ProblemFilter.exclude[ReversedMissingMethodProblem]("mill.scalalib.JavaModule.mill$scalalib$JavaModule$$super$internalRepositories"),
-    ProblemFilter.exclude[ReversedMissingMethodProblem]("mill.scalanativelib.ScalaNativeModule.mill$scalanativelib$ScalaNativeModule$$super$coursierProject"),
+    ProblemFilter.exclude[ReversedMissingMethodProblem](
+      "mill.scalalib.JavaModule.mill$scalalib$JavaModule$$super$internalRepositories"
+    ),
+    ProblemFilter.exclude[ReversedMissingMethodProblem](
+      "mill.scalanativelib.ScalaNativeModule.mill$scalanativelib$ScalaNativeModule$$super$coursierProject"
+    ),
 
     // https://github.com/com-lihaoyi/mill/pull/3503
     ProblemFilter.exclude[ReversedMissingMethodProblem](

diff --git a/changelog.adoc b/changelog.adoc
diff --git a/ci/package.mill b/ci/package.mill
diff --git a/ci/shared.mill b/ci/shared.mill
diff --git a/ci/upload.mill b/ci/upload.mill
diff --git a/contrib/package.mill b/contrib/package.mill
@@ -20,8 +20,6 @@ import build.Deps
 
 // plugins and dependencies
 import $meta._
-import $file.ci.shared
-import $file.ci.upload
 
 object `package` extends RootModule {
   def contribModules: Seq[ContribModule] =
@@ -115,7 +113,7 @@ object `package` extends RootModule {
     def testArgs = Task {
       super.testArgs() ++
         Seq(
-          s"-DMILL_SCOVERAGE2_VERSION=${build.Deps.scalacScoverage2Plugin.dep.version}",
+          s"-DMILL_SCOVERAGE2_VERSION=${build.Deps.scalacScoverage2Plugin.dep.version}"
         )
     }