rename modules scalaworker -> scalalib.worker, client -> main.client

18 files changed, 49 insertions, 50 deletions

diff --git a/build.sc b/build.sc
index 413689a4..b80b6c0f 100755
--- a/build.sc
+++ b/build.sc
@@ -64,19 +64,6 @@ trait MillModule extends MillPublishModule with ScalaModule{ outer =>
   }
 }
 
-object client extends MillPublishModule{
-  def ivyDeps = Agg(
-    ivy"org.scala-sbt.ipcsocket:ipcsocket:1.0.0".exclude(
-      "net.java.dev.jna" -> "jna",
-      "net.java.dev.jna" -> "jna-platform"
-    )
-  )
-  object test extends Tests{
-    def testFrameworks = Seq("com.novocode.junit.JUnitFramework")
-    def ivyDeps = Agg(ivy"com.novocode:junit-interface:0.11")
-  }
-}
-
 
 object testng extends MillPublishModule{
   def ivyDeps = Agg(
@@ -124,18 +111,19 @@ object main extends MillModule {
       Seq(PathRef(shared.generateCoreTestSources(T.ctx().dest)))
     }
   }
-}
-
-
-object scalaworker extends MillModule{
-  def moduleDeps = Seq(main, scalalib)
 
-  def ivyDeps = Agg(
-    ivy"org.scala-sbt::zinc:1.1.4"
-  )
-  def testArgs = Seq(
-    "-DMILL_SCALA_WORKER=" + runClasspath().map(_.path).mkString(",")
-  )
+  object client extends MillPublishModule{
+    def ivyDeps = Agg(
+      ivy"org.scala-sbt.ipcsocket:ipcsocket:1.0.0".exclude(
+        "net.java.dev.jna" -> "jna",
+        "net.java.dev.jna" -> "jna-platform"
+      )
+    )
+    object test extends Tests{
+      def testFrameworks = Seq("com.novocode.junit.JUnitFramework")
+      def ivyDeps = Agg(ivy"com.novocode:junit-interface:0.11")
+    }
+  }
 }
 
 
@@ -159,9 +147,20 @@ object scalalib extends MillModule {
       genTask(scalalib)() ++
       genTask(scalajslib)()
 
-    scalaworker.testArgs() ++
+    worker.testArgs() ++
     Seq("-Djna.nosys=true") ++ Seq("-DMILL_BUILD_LIBRARIES=" + genIdeaArgs.map(_.path).mkString(","))
   }
+
+  object worker extends MillModule{
+    def moduleDeps = Seq(main, scalalib)
+
+    def ivyDeps = Agg(
+      ivy"org.scala-sbt::zinc:1.1.4"
+    )
+    def testArgs = Seq(
+      "-DMILL_SCALA_WORKER=" + runClasspath().map(_.path).mkString(",")
+    )
+  }
 }
 
 
@@ -174,7 +173,7 @@ object scalajslib extends MillModule {
       "MILL_SCALAJS_BRIDGE_0_6" -> jsbridges("0.6").compile().classes.path,
       "MILL_SCALAJS_BRIDGE_1_0" -> jsbridges("1.0").compile().classes.path
     )
-    Seq("-Djna.nosys=true") ++ scalaworker.testArgs() ++ (for((k, v) <- mapping.toSeq) yield s"-D$k=$v")
+    Seq("-Djna.nosys=true") ++ scalalib.worker.testArgs() ++ (for((k, v) <- mapping.toSeq) yield s"-D$k=$v")
   }
 
   object jsbridges extends Cross[JsBridgeModule]("0.6", "1.0")
@@ -220,7 +219,7 @@ object integration extends MillModule{
   def moduleDeps = Seq(moduledefs, scalalib, scalajslib)
   def testArgs = T{
     scalajslib.testArgs() ++
-    scalaworker.testArgs() ++
+    scalalib.worker.testArgs() ++
     Seq(
       "-DMILL_TESTNG=" + testng.runClasspath().map(_.path).mkString(","),
       "-DMILL_VERSION=" + build.publishVersion()._2,
@@ -265,7 +264,7 @@ def launcherScript(jvmArgs: Seq[String],
          |    ${java("mill.Main")}
          |    ;;
          |  *)
-         |    ${java("mill.client.Main")}
+         |    ${java("mill.main.client.Main")}
          |    ;;
          |esac""".stripMargin
     },
@@ -278,7 +277,7 @@ def launcherScript(jvmArgs: Seq[String],
          |if defined _I_ (
          |  ${java("mill.Main")}
          |) else (
-         |  ${java("mill.client.Main")}
+         |  ${java("mill.main.client.Main")}
          |)""".stripMargin
     }
   )
@@ -296,7 +295,7 @@ object dev extends MillModule{
   def forkArgs =
     scalalib.testArgs() ++
     scalajslib.testArgs() ++
-    scalaworker.testArgs() ++
+    scalalib.worker.testArgs() ++
     // Workaround for Zinc/JNA bug
     // https://github.com/sbt/sbt/blame/6718803ee6023ab041b045a6988fafcfae9d15b5/main/src/main/scala/sbt/Main.scala#L130
     Seq("-Djna.nosys=true", "-DMILL_VERSION=" + build.publishVersion()._2)
diff --git a/ci/test-mill-0.sh b/ci/test-mill-0.sh
index faee6c1e..daae5bd6 100755
--- a/ci/test-mill-0.sh
+++ b/ci/test-mill-0.sh
@@ -6,4 +6,4 @@ set -eux
 git clean -xdf
 
 # Run tests
-mill -i all {main,scalalib,scalajslib,client}.test
+mill -i all {main,scalalib,scalajslib,main.client}.test
diff --git a/docs/pages/1 - Intro to Mill.md b/docs/pages/1 - Intro to Mill.md
index 8c78ee98..f3d9706b 100644
--- a/docs/pages/1 - Intro to Mill.md
+++ b/docs/pages/1 - Intro to Mill.md
@@ -340,7 +340,7 @@ $ mill resolve _.compile
 main.compile
 moduledefs.compile
 core.compile
-scalaworker.compile
+scalalib.worker.compile
 scalalib.compile
 scalajslib.compile
 integration.compile
diff --git a/integration/test/src/mill/integration/CaffeineTests.scala b/integration/test/src/mill/integration/CaffeineTests.scala
index 310f3f2d..56c66b21 100644
--- a/integration/test/src/mill/integration/CaffeineTests.scala
+++ b/integration/test/src/mill/integration/CaffeineTests.scala
@@ -8,7 +8,7 @@ class CaffeineTests(fork: Boolean) extends IntegrationTestSuite("MILL_CAFFEINE_R
     'test - {
       // Caffeine only can build using Java 9 or up. Java 8 results in weird
       // type inference issues during the compile
-      if (mill.client.Util.isJava9OrAbove){
+      if (mill.main.client.Util.isJava9OrAbove){
         assert(eval("caffeine.test.compile"))
 
         val suites = Seq(
diff --git a/client/src/mill/client/InputPumper.java b/main/client/src/mill/main/client/InputPumper.java
index 1789d069..5205be0b 100644
--- a/client/src/mill/client/InputPumper.java
+++ b/main/client/src/mill/main/client/InputPumper.java
@@ -1,4 +1,4 @@
-package mill.client;
+package mill.main.client;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/client/src/mill/client/Lock.java b/main/client/src/mill/main/client/Lock.java
index 115529d3..890a352b 100644
--- a/client/src/mill/client/Lock.java
+++ b/main/client/src/mill/main/client/Lock.java
@@ -1,4 +1,4 @@
-package mill.client;
+package mill.main.client;
 public abstract class Lock{
     abstract public Locked lock() throws Exception;
     abstract public Locked tryLock() throws Exception;
diff --git a/client/src/mill/client/Locked.java b/main/client/src/mill/main/client/Locked.java
index 6ba7dab5..e6ad3d63 100644
--- a/client/src/mill/client/Locked.java
+++ b/main/client/src/mill/main/client/Locked.java
@@ -1,4 +1,4 @@
-package mill.client;
+package mill.main.client;
 
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
diff --git a/client/src/mill/client/Locks.java b/main/client/src/mill/main/client/Locks.java
index 3b397fce..2843973d 100644
--- a/client/src/mill/client/Locks.java
+++ b/main/client/src/mill/main/client/Locks.java
@@ -1,4 +1,4 @@
-package mill.client;
+package mill.main.client;
 
 import java.io.RandomAccessFile;
 import java.nio.channels.FileChannel;
diff --git a/client/src/mill/client/Main.java b/main/client/src/mill/main/client/Main.java
index 3a0a2db8..98445d3c 100644
--- a/client/src/mill/client/Main.java
+++ b/main/client/src/mill/main/client/Main.java
@@ -1,4 +1,4 @@
-package mill.client;
+package mill.main.client;
 
 import org.scalasbt.ipcsocket.*;
 
diff --git a/client/src/mill/client/Util.java b/main/client/src/mill/main/client/Util.java
index f6adb3cc..54361734 100644
--- a/client/src/mill/client/Util.java
+++ b/main/client/src/mill/main/client/Util.java
@@ -1,4 +1,4 @@
-package mill.client;
+package mill.main.client;
 
 
 import java.io.IOException;
diff --git a/client/test/src/mill/client/ClientTests.java b/main/client/test/src/mill/main/client/ClientTests.java
index 4059e5c7..5ae44d3f 100644
--- a/client/test/src/mill/client/ClientTests.java
+++ b/main/client/test/src/mill/main/client/ClientTests.java
@@ -1,4 +1,4 @@
-package mill.client;
+package mill.main.client;
 
 import static org.junit.Assert.assertEquals;
 import org.junit.Test;
diff --git a/main/src/mill/Main.scala b/main/src/mill/Main.scala
index 2992afa4..5573a325 100644
--- a/main/src/mill/Main.scala
+++ b/main/src/mill/Main.scala
@@ -106,7 +106,7 @@ object Main {
             env
           )
 
-          if (mill.client.Util.isJava9OrAbove) {
+          if (mill.main.client.Util.isJava9OrAbove) {
             val rt = cliConfig.home / Export.rtJarName
             if (!exists(rt)) {
               runner.printInfo(s"Preparing Java ${System.getProperty("java.version")} runtime; this may take a minute or two ...")
diff --git a/main/src/mill/main/Server.scala b/main/src/mill/main/Server.scala
index 275767c8..07703bed 100644
--- a/main/src/mill/main/Server.scala
+++ b/main/src/mill/main/Server.scala
@@ -6,7 +6,7 @@ import java.net.Socket
 import mill.Main
 import scala.collection.JavaConverters._
 import org.scalasbt.ipcsocket._
-import mill.client._
+import mill.main.client._
 import mill.eval.Evaluator
 import mill.util.DummyInputStream
 
@@ -28,7 +28,7 @@ object ServerMain extends mill.main.ServerMain[Evaluator.State]{
       this,
       () => System.exit(0),
       300000,
-      mill.client.Locks.files(args0(0))
+      mill.main.client.Locks.files(args0(0))
     ).run()
   }
   def main0(args: Array[String],
diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala
index e7fd6a79..9e22f614 100644
--- a/main/src/mill/modules/Jvm.scala
+++ b/main/src/mill/modules/Jvm.scala
@@ -9,7 +9,7 @@ import java.util.jar.{JarEntry, JarFile, JarOutputStream}
 
 import ammonite.ops._
 import geny.Generator
-import mill.client.InputPumper
+import mill.main.client.InputPumper
 import mill.eval.PathRef
 import mill.util.{Ctx, IO}
 import mill.util.Loose.Agg
diff --git a/main/test/src/mill/main/ClientServerTests.scala b/main/test/src/mill/main/ClientServerTests.scala
index 7139c4db..7ed826af 100644
--- a/main/test/src/mill/main/ClientServerTests.scala
+++ b/main/test/src/mill/main/ClientServerTests.scala
@@ -2,7 +2,7 @@ package mill.main
 import java.io._
 import java.nio.file.Path
 
-import mill.client.{Util, Locks}
+import mill.main.client.{Util, Locks}
 
 import scala.collection.JavaConverters._
 import utest._
@@ -60,7 +60,7 @@ object ClientServerTests extends TestSuite{
                   (env : Map[String, String], args: Array[String]) = {
     val (in, out, err) = initStreams()
     Server.lockBlock(locks.clientLock){
-      mill.client.Main.run(
+      mill.main.client.Main.run(
         tmpDir.toString,
         () => spawnEchoServer(tmpDir, locks),
         locks,
diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala
index c98ea94a..3134851e 100644
--- a/scalalib/src/mill/scalalib/JavaModule.scala
+++ b/scalalib/src/mill/scalalib/JavaModule.scala
@@ -297,7 +297,7 @@ trait TestModule extends JavaModule with TaskModule {
     val outputPath = T.ctx().dest/"out.json"
 
     Jvm.subprocess(
-      mainClass = "mill.scalaworker.ScalaWorker",
+      mainClass = "mill.scalalib.worker.ScalaWorker",
       classPath = ScalaWorkerModule.classpath(),
       jvmArgs = forkArgs(),
       envArgs = forkEnv(),
diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
index 0b6a931b..a01c1c2c 100644
--- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
+++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala
@@ -29,7 +29,7 @@ trait ScalaWorkerModule extends mill.Module{
       resolveDependencies(
         repositories,
         Lib.depToDependency(_, "2.12.4", ""),
-        Seq(ivy"com.lihaoyi::mill-scalaworker:${sys.props("MILL_VERSION")}")
+        Seq(ivy"com.lihaoyi::mill-scalalib-worker:${sys.props("MILL_VERSION")}")
       ).map(_.map(_.path))
     }
   }
@@ -38,7 +38,7 @@ trait ScalaWorkerModule extends mill.Module{
       classpath().map(_.toNIO.toUri.toURL).toVector,
       getClass.getClassLoader
     )
-    val cls = cl.loadClass("mill.scalaworker.ScalaWorker")
+    val cls = cl.loadClass("mill.scalalib.worker.ScalaWorker")
     val instance = cls.getConstructor(classOf[mill.util.Ctx], classOf[Array[String]])
       .newInstance(T.ctx(), compilerInterfaceClasspath().map(_.path.toString).toArray[String])
     instance.asInstanceOf[ScalaWorkerApi]
diff --git a/scalaworker/src/mill/scalaworker/ScalaWorker.scala b/scalalib/worker/src/mill/scalalib/worker/ScalaWorker.scala
index 8c11379f..cebef9b7 100644
--- a/scalaworker/src/mill/scalaworker/ScalaWorker.scala
+++ b/scalalib/worker/src/mill/scalalib/worker/ScalaWorker.scala
@@ -1,4 +1,4 @@
-package mill.scalaworker
+package mill.scalalib.worker
 
 import java.io.File
 import java.util.Optional