Rebootstrap on latest optional RootModule changes (#5011)

Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com>

Author: lihaoyi

build.mill

@@ -1,4 +1,4 @@
-//| mill-version: 0.13.0-M1-43-b217bc
+//| mill-version: 0.13.0-M2-19-7fbdc2
 
 package build
 // imports
@@ -18,11 +18,6 @@ import mill.T
 import mill.define.Cross
 import scala.util.Properties
 
-// plugins and dependencies
-import $meta._
-
-import $packages._
-
 object Settings {
   val pomOrg = "com.lihaoyi"
   val githubOrg = "com-lihaoyi"

ci/mill-bootstrap.patch

@@ -1,28 +0,0 @@
-diff --git a/build.mill b/build.mill
-index d815508132a..ba62e147383 100644
---- a/build.mill
-+++ b/build.mill
-@@ -19,9 +19,8 @@ import mill.define.Cross
- import scala.util.Properties
- 
- // plugins and dependencies
--import $meta._
-+//| meta: true
- 
--import $packages._
- 
- object Settings {
-   val pomOrg = "com.lihaoyi"
-diff --git a/mill-build/build.mill b/mill-build/build.mill
-index f32b3cbcf65..3fc9b0097c8 100644
---- a/mill-build/build.mill
-+++ b/mill-build/build.mill
-@@ -14,7 +14,7 @@ object `package` extends MillBuildRootModule {
-     // TODO: implement empty version for ivy deps as we do in import parser
-     mvn"com.lihaoyi::mill-contrib-buildinfo:${mill.api.BuildInfo.millVersion}",
- //    mvn"com.goyeau::mill-scalafix::0.5.0",
--    mvn"com.lihaoyi::mill-main-graphviz:${mill.api.BuildInfo.millVersion}",
-+    mvn"com.lihaoyi::mill-libs-graphviz:${mill.api.BuildInfo.millVersion}",
-     // TODO: document, why we have this dependency
-     mvn"org.jsoup:jsoup:1.18.1"
-   )

core/api/package.mill

@@ -8,7 +8,7 @@ import mill._
  * internal code and user-land code. Should have zero or minimal dependencies
  * to ensure the two codebases are not bound to the same versions of shared libraries
  */
-object `package` extends RootModule with build.MillStableScalaModule with BuildInfo {
+object `package` extends build.MillStableScalaModule with BuildInfo {
   def moduleDeps = Seq(build.core.constants)
 
   def buildInfoPackageName = "mill.api"

core/constants/package.mill

@@ -8,7 +8,7 @@ import mill.scalalib._
  * This module contains basic constants and helpers shared between the client,
  * server, and the rest of the Mill codebase.
  */
-object `package` extends RootModule with build.MillPublishJavaModule with BuildInfo {
+object `package` extends build.MillPublishJavaModule with BuildInfo {
   def buildInfoPackageName = "mill.constants"
   def buildInfoMembers = Seq(
     BuildInfo.Value("millVersion", build.millVersion(), "Mill version."),

core/define/package.mill

@@ -7,7 +7,7 @@ import mill.scalalib._
  * This module contains the data types necessary for defining a Mill build:
  * defining Tasks, Modules, helper code, and other related data structures.
  */
-object `package` extends RootModule with build.MillStableScalaModule {
+object `package` extends build.MillStableScalaModule {
   def moduleDeps = Seq(build.core.api)
 
   def compileMvnDeps = Task {

core/eval/package.mill

@@ -8,6 +8,6 @@ import mill._
  * without any of the user-land logic or helpers necessary to build actual
  * codebases.
  */
-object `package` extends RootModule with build.MillStableScalaModule {
+object `package` extends build.MillStableScalaModule {
   def moduleDeps = Seq(build.core.define, build.core.exec, build.core.resolve)
 }

core/exec/package.mill

@@ -6,7 +6,7 @@ import mill._
  * This module contains code related to planning and execution of the Mill
  * task graph after it has been resolved.
  */
-object `package` extends RootModule with build.MillStableScalaModule {
+object `package` extends build.MillStableScalaModule {
   def moduleDeps = Seq(build.core.define, build.core.internal)
   def mvnDeps = Seq(build.Deps.snakeyamlEngine)
 }

core/internal/package.mill

@@ -6,7 +6,7 @@ import mill._
  * This package contains internal helpers and utilities used throughout
  * Mill's own internal code but not intended for use by user-land code.
  */
-object `package` extends RootModule with build.MillPublishScalaModule {
+object `package` extends build.MillPublishScalaModule {
   def moduleDeps = Seq(build.core.api, build.core.util)
 
   def mvnDeps = Agg(

core/resolve/package.mill

@@ -7,6 +7,6 @@ import mill._
  * tokens like 'foo.{bar,qux}.baz' into Mill tasks that can be
  * executed via [[build.core.exec]]
  */
-object `package` extends RootModule with build.MillStableScalaModule {
+object `package` extends build.MillStableScalaModule {
   def moduleDeps = Seq(build.core.api, build.core.define, build.core.internal)
 }

core/util/package.mill

@@ -8,7 +8,7 @@ import mill.scalalib._
  * be part of the interface between the two classloader environments to ensure
  * isolation between them
  */
-object `package` extends RootModule with build.MillStableScalaModule with BuildInfo {
+object `package` extends build.MillStableScalaModule with BuildInfo {
   def moduleDeps = Seq(build.core.api, build.core.constants, build.core.define)
 
   def mvnDeps = Agg(