summaryrefslogtreecommitdiff
path: root/scalalib
diff options
context:
space:
mode:
Diffstat (limited to 'scalalib')
-rw-r--r--scalalib/src/mill/scalalib/JavaModule.scala4
-rw-r--r--scalalib/src/mill/scalalib/ScalaModule.scala2
2 files changed, 3 insertions, 3 deletions
diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala
index 79fad9aa..fca69f42 100644
--- a/scalalib/src/mill/scalalib/JavaModule.scala
+++ b/scalalib/src/mill/scalalib/JavaModule.scala
@@ -17,6 +17,8 @@ import mill.util.Loose.Agg
* Core configuration required to compile a single Scala compilation target
*/
trait JavaModule extends mill.Module with TaskModule { outer =>
+ def scalaWorker: ScalaWorkerModule = mill.scalalib.ScalaWorkerModule
+
trait Tests extends TestModule{
override def moduleDeps = Seq(outer)
override def repositories = outer.repositories
@@ -311,7 +313,7 @@ trait TestModule extends JavaModule with TaskModule {
Jvm.subprocess(
mainClass = "mill.scalalib.TestRunner",
- classPath = ScalaWorkerModule.scalalibClasspath().map(_.path),
+ classPath = scalaWorker.scalalibClasspath().map(_.path),
jvmArgs = forkArgs(),
envArgs = forkEnv(),
mainArgs =
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala
index 7e885415..35ffbbdd 100644
--- a/scalalib/src/mill/scalalib/ScalaModule.scala
+++ b/scalalib/src/mill/scalalib/ScalaModule.scala
@@ -16,8 +16,6 @@ import mill.util.DummyInputStream
* Core configuration required to compile a single Scala compilation target
*/
trait ScalaModule extends JavaModule { outer =>
- def scalaWorker: ScalaWorkerModule = mill.scalalib.ScalaWorkerModule
-
trait Tests extends TestModule with ScalaModule{
def scalaVersion = outer.scalaVersion()
override def repositories = outer.repositories