From e34e67588be6978451fb198335ae938aa17e5964 Mon Sep 17 00:00:00 2001 From: aosagie Date: Wed, 6 Jun 2018 23:40:23 -0400 Subject: Allow configuration of TestRunner's ScalaWorkerModule (#364) --- scalalib/src/mill/scalalib/JavaModule.scala | 4 +++- scalalib/src/mill/scalalib/ScalaModule.scala | 2 -- 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 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 -- cgit v1.2.3 From e96b57ef1a9a1b47098d7d09a7d1422635d1af2c Mon Sep 17 00:00:00 2001 From: aosagie Date: Fri, 8 Jun 2018 23:36:41 -0400 Subject: Allow configuration of JavaModule and ScalafmtModule scala workers (#367) --- scalalib/src/mill/scalalib/JavaModule.scala | 2 +- scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'scalalib/src') diff --git a/scalalib/src/mill/scalalib/JavaModule.scala b/scalalib/src/mill/scalalib/JavaModule.scala index fca69f42..ac162db7 100644 --- a/scalalib/src/mill/scalalib/JavaModule.scala +++ b/scalalib/src/mill/scalalib/JavaModule.scala @@ -91,7 +91,7 @@ trait JavaModule extends mill.Module with TaskModule { outer => } - def repositories: Seq[Repository] = ScalaWorkerModule.repositories + def repositories: Seq[Repository] = scalaWorker.repositories def platformSuffix = T{ "" } diff --git a/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala b/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala index 3b325b4c..c4d64b0e 100644 --- a/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala +++ b/scalalib/src/mill/scalalib/scalafmt/ScalafmtModule.scala @@ -23,7 +23,7 @@ trait ScalafmtModule extends JavaModule { def scalafmtDeps: T[Agg[PathRef]] = T { Lib.resolveDependencies( - ScalaWorkerModule.repositories, + scalaWorker.repositories, Lib.depToDependency(_, "2.12.4"), Seq(ivy"com.geirsson::scalafmt-cli:${scalafmtVersion()}") ) -- cgit v1.2.3