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

3 files changed, 4 insertions, 4 deletions

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