Clean up the provisional client-server code with unit tests and proper file-sockets

Seems to work well enough for interactive scala consoles, though still not Ammonite

Also Added ScalaModule#launcher and re-worked our build.sc file to use it

1 files changed, 4 insertions, 6 deletions

diff --git a/main/src/mill/main/MainRunner.scala b/main/src/mill/main/MainRunner.scala
index 2bd7fbc6..907f8a7b 100644
--- a/main/src/mill/main/MainRunner.scala
+++ b/main/src/mill/main/MainRunner.scala
@@ -5,12 +5,9 @@ import ammonite.interp.{Interpreter, Preprocessor}
 import ammonite.ops.Path
 import ammonite.util._
 import mill.eval.{Evaluator, PathRef}
-import mill.main.MainRunner.WatchInterrupted
+
 import mill.util.PrintLogger
 
-object MainRunner{
-  case class WatchInterrupted(stateCache: Option[Evaluator.State]) extends Exception
-}
 
 /**
   * Customized version of [[ammonite.MainRunner]], allowing us to run Mill
@@ -37,7 +34,7 @@ class MainRunner(val config: ammonite.main.Cli.Config,
     }
 
     while(statAll()) {
-      if (interruptWatch()) throw WatchInterrupted(stateCache)
+      if (interruptWatch()) throw mill.clientserver.WatchInterrupted(stateCache)
       Thread.sleep(100)
     }
   }
@@ -58,7 +55,8 @@ class MainRunner(val config: ammonite.main.Cli.Config,
             colors,
             outprintStream,
             errPrintStream,
-            errPrintStream
+            errPrintStream,
+            stdIn
           )
         )