diff options
Diffstat (limited to 'scalalib')
-rw-r--r-- | scalalib/src/mill/scalalib/GenIdea.scala | 6 | ||||
-rw-r--r-- | scalalib/src/mill/scalalib/ScalaWorkerApi.scala | 2 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/GenIdeaTests.scala | 3 | ||||
-rw-r--r-- | scalalib/test/src/mill/scalalib/HelloWorldTests.scala | 18 |
4 files changed, 11 insertions, 18 deletions
diff --git a/scalalib/src/mill/scalalib/GenIdea.scala b/scalalib/src/mill/scalalib/GenIdea.scala index 60153f1f..4bfa6c4c 100644 --- a/scalalib/src/mill/scalalib/GenIdea.scala +++ b/scalalib/src/mill/scalalib/GenIdea.scala @@ -6,13 +6,13 @@ import coursier.maven.MavenRepository import mill.define._ import mill.eval.{Evaluator, PathRef, Result} import mill.scalalib -import mill.util.Ctx.LogCtx +import mill.util.Ctx.Log import mill.util.{Loose, PrintLogger, Strict} import mill.util.Strict.Agg object GenIdea { - def apply()(implicit ctx: LogCtx, + def apply()(implicit ctx: Log, rootModule0: BaseModule.Implicit, discover: Discover[_]): Unit = { val rootModule = rootModule0.value @@ -21,7 +21,7 @@ object GenIdea { rm! pwd/".idea_modules" - val evaluator = new Evaluator(pwd / 'out, pwd / 'out, pwd, rootModule, discover, ctx.log) + val evaluator = new Evaluator(pwd / 'out, pwd, rootModule, discover, ctx.log) for((relPath, xml) <- xmlFileLayout(evaluator, rootModule)){ write.over(pwd/relPath, pp.format(xml)) diff --git a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala index 4f9c527c..a587a48c 100644 --- a/scalalib/src/mill/scalalib/ScalaWorkerApi.scala +++ b/scalalib/src/mill/scalalib/ScalaWorkerApi.scala @@ -61,5 +61,5 @@ trait ScalaWorkerApi { entireClasspath: Agg[Path], testClassfilePath: Agg[Path], args: Seq[String]) - (implicit ctx: mill.util.Ctx.LogCtx): (String, Seq[Result]) + (implicit ctx: mill.util.Ctx.Log): (String, Seq[Result]) } diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala index 00d9f53e..ea8cfc82 100644 --- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala +++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala @@ -21,8 +21,7 @@ object GenIdeaTests extends TestSuite { val helloWorldEvaluator = new TestEvaluator( HelloWorld, - outPath, - workingSrcPath + outPath ) def tests: Tests = Tests { diff --git a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala index cecc9349..14012809 100644 --- a/scalalib/test/src/mill/scalalib/HelloWorldTests.scala +++ b/scalalib/test/src/mill/scalalib/HelloWorldTests.scala @@ -84,33 +84,27 @@ object HelloWorldTests extends TestSuite { val helloWorldEvaluator = new TestEvaluator( HelloWorld, - outPath, - workingSrcPath + outPath ) val helloWorldWithMainEvaluator = new TestEvaluator( HelloWorldWithMain, - outPath, - workingSrcPath + outPath ) val helloWorldWithMainAssemblyEvaluator = new TestEvaluator( HelloWorldWithMainAssembly, - outPath, - workingSrcPath + outPath ) val helloWorldFatalEvaluator = new TestEvaluator( HelloWorldFatalWarnings, - outPath, - workingSrcPath + outPath ) val helloWorldOverrideEvaluator = new TestEvaluator( HelloWorldScalaOverride, - outPath, - workingSrcPath + outPath ) val helloWorldCrossEvaluator = new TestEvaluator( CrossHelloWorld, - outPath, - workingSrcPath + outPath ) |