diff options
-rw-r--r-- | client/src/mill/client/Client.java (renamed from clientserver/src/mill/clientserver/Client.java) | 2 | ||||
-rw-r--r-- | client/src/mill/client/ClientServer.java (renamed from clientserver/src/mill/clientserver/ClientServer.java) | 2 | ||||
-rw-r--r-- | client/src/mill/client/InputPumper.java (renamed from clientserver/src/mill/clientserver/InputPumper.java) | 2 | ||||
-rw-r--r-- | client/src/mill/client/Locks.java (renamed from clientserver/src/mill/clientserver/Locks.java) | 2 | ||||
-rw-r--r-- | main/src/mill/Main.scala | 3 | ||||
-rw-r--r-- | main/src/mill/main/Server.scala (renamed from clientserver/src/mill/clientserver/Server.scala) | 2 | ||||
-rw-r--r-- | main/src/mill/modules/Jvm.scala | 4 | ||||
-rw-r--r-- | main/test/src/mill/main/ClientServerTests.scala (renamed from clientserver/test/src/mill/clientserver/ClientServerTests.scala) | 3 |
8 files changed, 11 insertions, 9 deletions
diff --git a/clientserver/src/mill/clientserver/Client.java b/client/src/mill/client/Client.java index c4cbc265..dd984f13 100644 --- a/clientserver/src/mill/clientserver/Client.java +++ b/client/src/mill/client/Client.java @@ -1,4 +1,4 @@ -package mill.clientserver; +package mill.client; import org.scalasbt.ipcsocket.*; diff --git a/clientserver/src/mill/clientserver/ClientServer.java b/client/src/mill/client/ClientServer.java index e2e63dcf..c30fc221 100644 --- a/clientserver/src/mill/clientserver/ClientServer.java +++ b/client/src/mill/client/ClientServer.java @@ -1,4 +1,4 @@ -package mill.clientserver; +package mill.client; import java.io.IOException; diff --git a/clientserver/src/mill/clientserver/InputPumper.java b/client/src/mill/client/InputPumper.java index 9f4bfb82..1789d069 100644 --- a/clientserver/src/mill/clientserver/InputPumper.java +++ b/client/src/mill/client/InputPumper.java @@ -1,4 +1,4 @@ -package mill.clientserver; +package mill.client; import java.io.InputStream; import java.io.OutputStream; diff --git a/clientserver/src/mill/clientserver/Locks.java b/client/src/mill/client/Locks.java index 78c8dc6e..2cc86abf 100644 --- a/clientserver/src/mill/clientserver/Locks.java +++ b/client/src/mill/client/Locks.java @@ -1,4 +1,4 @@ -package mill.clientserver; +package mill.client; import java.io.RandomAccessFile; import java.nio.channels.FileChannel; diff --git a/main/src/mill/Main.scala b/main/src/mill/Main.scala index e026dfe0..4cbf30fa 100644 --- a/main/src/mill/Main.scala +++ b/main/src/mill/Main.scala @@ -6,6 +6,7 @@ import ammonite.main.Cli._ import ammonite.ops._ import ammonite.util.Util import io.github.retronym.java9rtexport.Export +import mill.client.ClientServer import mill.eval.Evaluator import mill.util.DummyInputStream @@ -119,7 +120,7 @@ object Main { stateCache ) - if (mill.clientserver.ClientServer.isJava9OrAbove) { + if (ClientServer.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/clientserver/src/mill/clientserver/Server.scala b/main/src/mill/main/Server.scala index 24827ac2..ac75dfd0 100644 --- a/clientserver/src/mill/clientserver/Server.scala +++ b/main/src/mill/main/Server.scala @@ -1,4 +1,4 @@ -package mill.clientserver +package mill.main import java.io._ import java.net.Socket diff --git a/main/src/mill/modules/Jvm.scala b/main/src/mill/modules/Jvm.scala index 287dc624..e7fd6a79 100644 --- a/main/src/mill/modules/Jvm.scala +++ b/main/src/mill/modules/Jvm.scala @@ -1,6 +1,6 @@ package mill.modules -import java.io.{ByteArrayInputStream, FileOutputStream, File} +import java.io.{ByteArrayInputStream, File, FileOutputStream} import java.lang.reflect.Modifier import java.net.{URI, URLClassLoader} import java.nio.file.{FileSystems, Files, OpenOption, StandardOpenOption} @@ -9,7 +9,7 @@ import java.util.jar.{JarEntry, JarFile, JarOutputStream} import ammonite.ops._ import geny.Generator -import mill.clientserver.InputPumper +import mill.client.InputPumper import mill.eval.PathRef import mill.util.{Ctx, IO} import mill.util.Loose.Agg diff --git a/clientserver/test/src/mill/clientserver/ClientServerTests.scala b/main/test/src/mill/main/ClientServerTests.scala index 2c9a57b0..3ca7c737 100644 --- a/clientserver/test/src/mill/clientserver/ClientServerTests.scala +++ b/main/test/src/mill/main/ClientServerTests.scala @@ -1,4 +1,5 @@ -package mill.clientserver +package mill.main + import java.io._ import java.nio.file.Path |