migrate client module onto new JavaModule trait

2 files changed, 24 insertions, 19 deletions

diff --git a/main/src/mill/Main.scala b/main/src/mill/Main.scala
index 4cbf30fa..734d61e2 100644
--- a/main/src/mill/Main.scala
+++ b/main/src/mill/Main.scala
@@ -11,21 +11,6 @@ import mill.eval.Evaluator
 import mill.util.DummyInputStream
 
 
-object ServerMain extends mill.clientserver.ServerMain[Evaluator.State]{
-  def main0(args: Array[String],
-            stateCache: Option[Evaluator.State],
-            mainInteractive: Boolean,
-            stdin: InputStream,
-            stdout: PrintStream,
-            stderr: PrintStream) = Main.main0(
-    args,
-    stateCache,
-    mainInteractive,
-    DummyInputStream,
-    stdout,
-    stderr
-  )
-}
 object Main {
 
   def main(args: Array[String]): Unit = {
diff --git a/main/src/mill/main/Server.scala b/main/src/mill/main/Server.scala
index ac75dfd0..c0d75c87 100644
--- a/main/src/mill/main/Server.scala
+++ b/main/src/mill/main/Server.scala
@@ -3,25 +3,45 @@ package mill.main
 import java.io._
 import java.net.Socket
 
+import mill.Main
 import org.scalasbt.ipcsocket._
+import mill.client._
+import mill.eval.Evaluator
+import mill.util.DummyInputStream
 
 trait ServerMain[T]{
+  var stateCache = Option.empty[T]
+  def main0(args: Array[String],
+            stateCache: Option[T],
+            mainInteractive: Boolean,
+            stdin: InputStream,
+            stdout: PrintStream,
+            stderr: PrintStream): (Boolean, Option[T])
+}
+
+object ServerMain extends mill.main.ServerMain[Evaluator.State]{
   def main(args0: Array[String]): Unit = {
     new Server(
       args0(0),
       this,
       () => System.exit(0),
       300000,
-      Locks.files(args0(0))
+      mill.client.Locks.files(args0(0))
     ).run()
   }
-  var stateCache = Option.empty[T]
   def main0(args: Array[String],
-            stateCache: Option[T],
+            stateCache: Option[Evaluator.State],
             mainInteractive: Boolean,
             stdin: InputStream,
             stdout: PrintStream,
-            stderr: PrintStream): (Boolean, Option[T])
+            stderr: PrintStream) = Main.main0(
+    args,
+    stateCache,
+    mainInteractive,
+    DummyInputStream,
+    stdout,
+    stderr
+  )
 }