diff options
| author | aosagie <osagie@gmail.com> | 2018-06-06 23:40:23 -0400 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-06-06 20:40:23 -0700 |
| commit | e34e67588be6978451fb198335ae938aa17e5964 (patch) | |
| tree | 927920476c0443398f25a3a6087a03be4218592b /scalalib | |
| parent | c627dd1c20577115a111b293296dd06392220880 (diff) | |
| download | mill-e34e67588be6978451fb198335ae938aa17e5964.tar.gz mill-e34e67588be6978451fb198335ae938aa17e5964.tar.bz2 mill-e34e67588be6978451fb198335ae938aa17e5964.zip | |
Allow configuration of TestRunner's ScalaWorkerModule (#364)
Diffstat (limited to 'scalalib')
| -rw-r--r-- | scalalib/src/mill/scalalib/JavaModule.scala | 4 | ||||
| -rw-r--r-- | scalalib/src/mill/scalalib/ScalaModule.scala | 2 |
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 |