1 files changed, 10 insertions, 10 deletions
diff --git a/build.sc b/build.sc
index 5898913e..a86d7d75 100755
--- a/build.sc
+++ b/build.sc
@@ -11,7 +11,7 @@ import publish._
 import mill.modules.Jvm.createAssembly
 import upickle.Js
 trait MillPublishModule extends PublishModule{
-  def scalaVersion = "2.12.4"
+
   def artifactName = "mill-" + super.artifactName()
   def publishVersion = build.publishVersion()._2
 
@@ -27,17 +27,18 @@ trait MillPublishModule extends PublishModule{
   )
 
   def javacOptions = Seq("-source", "1.8", "-target", "1.8")
-
 }
-object moduledefs extends MillPublishModule{
+
+object moduledefs extends MillPublishModule with ScalaModule{
+  def scalaVersion = T{ "2.12.4" }
   def ivyDeps = Agg(
     ivy"org.scala-lang:scala-compiler:${scalaVersion()}",
     ivy"com.lihaoyi::sourcecode:0.1.4"
   )
 }
 
-trait MillModule extends MillPublishModule{ outer =>
-
+trait MillModule extends MillPublishModule with ScalaModule{ outer =>
+  def scalaVersion = T{ "2.12.4" }
   def compileIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7")
   def scalacOptions = Seq("-P:acyclic:force")
   def scalacPluginIvyDeps = Agg(ivy"com.lihaoyi::acyclic:0.1.7")
@@ -63,11 +64,10 @@ trait MillModule extends MillPublishModule{ outer =>
   }
 }
 
-object clientserver extends MillModule{
+object client extends MillPublishModule{
   def ivyDeps = Agg(
     ivy"org.scala-sbt.ipcsocket:ipcsocket:1.0.0"
   )
-  val test = new Tests(implicitly)
 }
 
 object core extends MillModule {
@@ -88,7 +88,7 @@ object core extends MillModule {
 }
 
 object main extends MillModule {
-  def moduleDeps = Seq(core, clientserver)
+  def moduleDeps = Seq(core, client)
 
 
   def compileIvyDeps = Agg(
@@ -238,7 +238,7 @@ def launcherScript(jvmArgs: Seq[String],
          |    ${java("mill.Main")}
          |    ;;
          |  *)
-         |    ${java("mill.clientserver.Client")}
+         |    ${java("mill.client.Main")}
          |    ;;
          |esac""".stripMargin
     },
@@ -251,7 +251,7 @@ def launcherScript(jvmArgs: Seq[String],
          |if defined _I_ (
          |  ${java("mill.Main")}
          |) else (
-         |  ${java("mill.clientserver.Client")}
+         |  ${java("mill.client.Main")}
          |)""".stripMargin
     }
   )