Re-organize runner folder (#5062)

This PR makes changes to `runner/` to try and make it consistent with
the code layout we use for with `core/` and `libs/`


* Renames
    * `runner` -> `runner.daemon`
    * `runner.client` -> `runner.launcher`
    * `runner.server.client` -> `runner.client`
    * `runner.worker-api` -> `runner.worker.api`
* `runner` is now an empty module with no sources of its own
* Remove the `.runner` segment in all these modules' JVM package paths

Author: lihaoyi

ci/mill-bootstrap.patch

@@ -0,0 +1,11 @@
+diff --git a/mill-build/build.mill b/mill-build/build.mill
+index 3fc9b0097c8..5b5843a74a6 100644
+--- a/mill-build/build.mill
++++ b/mill-build/build.mill
+@@ -1,5 +1,5 @@
+ import mill._
+-import mill.runner.meta.MillBuildRootModule
++import mill.meta.MillBuildRootModule
+ import mill.scalalib._
+ 
+ object `package` extends MillBuildRootModule {

dist/package.mill

@@ -19,7 +19,7 @@ trait DistModule extends Module {
   def executableRaw: T[PathRef]
 
   def executable = Task {
-    Task.traverse(allPublishModules)(m => m.publishLocalCached)()
+    Task.traverse(allPublishModules)(m => m.publishLocal(doc = false))()
     executableRaw()
   }
 
@@ -72,7 +72,7 @@ trait DistModule extends Module {
 
 object `package` extends MillJavaModule with DistModule {
 
-  def moduleDeps = Seq(build.runner.client)
+  def moduleDeps = Seq(build.runner.launcher)
 
   def transitiveLocalTestOverrides = Map(
     Task.traverse(allPublishModules)(_.localTestOverride)(): _*
@@ -133,7 +133,7 @@ object `package` extends MillJavaModule with DistModule {
     "-Djna.nosys=true"
   )
 
-  def mainClass = Some("mill.runner.client.MillClientMain")
+  def mainClass = Some("mill.launcher.MillLauncherMain")
 
   def executableRaw = Task {
     val filename = if (scala.util.Properties.isWin) "mill.bat" else "mill"
@@ -196,20 +196,20 @@ object `package` extends MillJavaModule with DistModule {
     prepareBootstrapLauncher(millBootstrapBat().path, Task.dest, build.millVersion(), "mill.bat")
   }
 
-  def examplePathsWithArtifactName: Task[Seq[(os.Path, String)]] = Task.Anon {
+  def examplePathsWithArtifactName: Task[Seq[(PathRef, String)]] = Task.Input {
     for {
       exampleMod <- build.example.exampleModules
       path = exampleMod.moduleDir
     } yield {
       val example = path.subRelativeTo(Task.workspace)
       val artifactName = example.segments.mkString("-")
-      (path, artifactName)
+      (PathRef(path), artifactName)
     }
   }
 
   def exampleZips: T[Seq[PathRef]] = Task {
     examplePathsWithArtifactName().map { case (examplePath, exampleStr) =>
-      os.copy(examplePath, Task.dest / exampleStr, createFolders = true)
+      os.copy(examplePath.path, Task.dest / exampleStr, createFolders = true)
       val ignoreErrorsOnCI = Task.dest / exampleStr / "ignoreErrorsOnCI"
       if (os.exists(ignoreErrorsOnCI)) os.remove(ignoreErrorsOnCI)
       os.write(Task.dest / exampleStr / ".mill-version", build.millLastTag())
@@ -255,9 +255,9 @@ object `package` extends MillJavaModule with DistModule {
     // Use assembly jar as the upstream ivy classpath rather than using runClasspath
     // directly to try and avoid native image command length problems on windows
     def nativeImageClasspath =
-      Seq(build.runner.client.resolvedIvyAssembly().pathRef) ++
-        build.runner.client.upstreamLocalAssemblyClasspath() ++
-        build.runner.client.localClasspath()
+      Seq(build.runner.launcher.resolvedIvyAssembly().pathRef) ++
+        build.runner.launcher.upstreamLocalAssemblyClasspath() ++
+        build.runner.launcher.localClasspath()
 
     def localBinName = "mill-native"
 

example/extending/metabuild/4-meta-build/mill-build/build.mill

@@ -1,6 +1,6 @@
 package build
 import mill._, scalalib._
-import mill.runner.meta.MillBuildRootModule
+import mill.meta.MillBuildRootModule
 
 object `package` extends MillBuildRootModule {
   val scalatagsVersion = "0.13.1"

example/extending/metabuild/5-meta-shared-sources/mill-build/build.mill

@@ -1,5 +1,5 @@
 package build
 import mill._
-import mill.runner.meta.MillBuildRootModule
+import mill.meta.MillBuildRootModule
 
 object `package` extends MillBuildRootModule

example/extending/plugins/7-writing-mill-plugins/build.mill

@@ -31,8 +31,8 @@ object myplugin extends ScalaModule with PublishModule {
 
     // Create a Mill executable configured for testing our plugin
     object millExecutable extends JavaModule {
-      def mvnDeps = Seq(mvn"com.lihaoyi:mill-runner-client_3:$millVersion")
-      def mainClass = Some("mill.runner.client.MillClientMain")
+      def mvnDeps = Seq(mvn"com.lihaoyi:mill-runner-launcher_3:$millVersion")
+      def mainClass = Some("mill.launcher.MillLauncherMain")
     }
   }
 

integration/feature/scala-3-syntax/resources/mill-build/build.mill

@@ -1,9 +1,10 @@
 package build
 
 import mill.*
+import mill.meta.MillBuildRootModule
 import mill.scalalib.*
 
-object `package` extends mill.runner.meta.MillBuildRootModule:
+object `package` extends MillBuildRootModule:
   def mvnDeps = Seq(
     mvn"org.scala-lang::toolkit:0.5.0"
   )

integration/ide/build-classpath-contents/resources/mill-build/build.mill

@@ -1,6 +1,6 @@
 package build
 import mill.*
+import mill.meta.MillBuildRootModule
 import mill.scalalib.*
-import mill.runner.meta.MillBuildRootModule
 
 object `package` extends MillBuildRootModule

integration/ide/gen-idea/resources/extended/idea/mill_modules/mill-build.mill-build.iml

@@ -79,8 +79,8 @@
         <orderEntry type="library" name="mill-libs_3.jar" level="project"/>
         <orderEntry type="library" name="mill-moduledefs_3-0.11.3-M5.jar" level="project"/>
         <orderEntry type="library" name="mill-runner-codesig_3.jar" level="project"/>
+        <orderEntry type="library" name="mill-runner-compilerworker-api_3.jar" level="project"/>
         <orderEntry type="library" name="mill-runner-meta_3.jar" level="project"/>
-        <orderEntry type="library" name="mill-runner-worker-api_3.jar" level="project"/>
         <orderEntry type="library" name="native-terminal-no-ffm-0.0.9.1.jar" level="project"/>
         <orderEntry type="library" name="os-lib_3-0.11.5-M2.jar" level="project"/>
         <orderEntry type="library" name="plexus-archiver-4.10.0.jar" level="project"/>

integration/ide/gen-idea/resources/extended/mill-build/build.mill

@@ -1,6 +1,6 @@
 import mill._
+import mill.meta.MillBuildRootModule
 import mill.scalalib._
-import mill.runner.meta.MillBuildRootModule
 
 object `package` extends MillBuildRootModule {
   def mvnDeps = Seq(mvn"org.scalameta::munit:0.7.29")

integration/invalidation/multi-level-editing/resources/mill-build/build.mill

@@ -1,7 +1,7 @@
 package build
 
 import mill._, scalalib._
-import mill.runner.meta.MillBuildRootModule
+import mill.meta.MillBuildRootModule
 
 object `package` extends MillBuildRootModule {
   def mvnDeps = Seq(mvn"com.lihaoyi::scalatags:${constant.MetaConstant.scalatagsVersion}")