From 2bc041237984bf674ea144ad1a14710c3ed2e47c Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Thu, 12 Apr 2018 21:24:18 -0700 Subject: rename modules scalaworker -> scalalib.worker, client -> main.client --- scalalib/src/mill/scalalib/JavaModule.scala | 2 +- scalalib/src/mill/scalalib/ScalaWorkerApi.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scalalib/src') diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala index c98ea94a..3134851e 100644 --- a/scalalib/src/mill/scalalib/JavaModule.scala +++ b/scalalib/src/mill/scalalib/JavaModule.scala @@ -297,7 +297,7 @@ trait TestModule extends JavaModule with TaskModule { val outputPath = T.ctx().dest/"out.json" Jvm.subprocess( - mainClass = "mill.scalaworker.ScalaWorker", + mainClass = "mill.scalalib.worker.ScalaWorker", classPath = ScalaWorkerModule.classpath(), jvmArgs = forkArgs(), envArgs = forkEnv(), diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala index 0b6a931b..a01c1c2c 100644 --- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala +++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala @@ -29,7 +29,7 @@ trait ScalaWorkerModule extends mill.Module{ resolveDependencies( repositories, Lib.depToDependency(_, "2.12.4", ""), - Seq(ivy"com.lihaoyi::mill-scalaworker:${sys.props("MILL_VERSION")}") + Seq(ivy"com.lihaoyi::mill-scalalib-worker:${sys.props("MILL_VERSION")}") ).map(_.map(_.path)) } } @@ -38,7 +38,7 @@ trait ScalaWorkerModule extends mill.Module{ classpath().map(_.toNIO.toUri.toURL).toVector, getClass.getClassLoader ) - val cls = cl.loadClass("mill.scalaworker.ScalaWorker") + val cls = cl.loadClass("mill.scalalib.worker.ScalaWorker") val instance = cls.getConstructor(classOf[mill.util.Ctx], classOf[Array[String]]) .newInstance(T.ctx(), compilerInterfaceClasspath().map(_.path.toString).toArray[String]) instance.asInstanceOf[ScalaWorkerApi] -- cgit v1.2.3