diff options
Diffstat (limited to 'contrib')
8 files changed, 15 insertions, 16 deletions
diff --git a/contrib/buildinfo/src/mill/contrib/BuildInfo.scala b/contrib/buildinfo/src/mill/contrib/BuildInfo.scala index 9202fd95..1c8d9d9e 100644 --- a/contrib/buildinfo/src/mill/contrib/BuildInfo.scala +++ b/contrib/buildinfo/src/mill/contrib/BuildInfo.scala @@ -2,9 +2,9 @@ package mill.contrib import mill.T import mill.define.Target -import mill.eval.PathRef +import mill.api.PathRef import mill.scalalib.ScalaModule -import mill.util.Ctx +import mill.api.Ctx trait BuildInfo extends ScalaModule { diff --git a/contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala b/contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala index 05070985..4293bba7 100644 --- a/contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala +++ b/contrib/buildinfo/test/src/mill/contrib/BuildInfoTests.scala @@ -3,7 +3,7 @@ package mill.contrib import java.util.jar.JarFile import mill._ import mill.define.Target -import mill.eval.Result._ +import mill.api.Result._ import mill.eval.{Evaluator, Result} import mill.modules.Assembly import mill.scalalib.publish.VersionControl diff --git a/contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBModule.scala b/contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBModule.scala index 9aa5b833..db5c5c8b 100644 --- a/contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBModule.scala +++ b/contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBModule.scala @@ -4,7 +4,7 @@ package contrib.scalapblib import coursier.{Cache, MavenRepository} import coursier.core.Version import mill.define.Sources -import mill.eval.PathRef +import mill.api.PathRef import mill.scalalib.Lib.resolveDependencies import mill.scalalib._ import mill.util.Loose diff --git a/contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBWorker.scala b/contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBWorker.scala index a1b345b4..125cd3fd 100644 --- a/contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBWorker.scala +++ b/contrib/scalapblib/src/mill/contrib/scalapblib/ScalaPBWorker.scala @@ -5,7 +5,7 @@ import java.io.File import java.lang.reflect.Method import java.net.URLClassLoader -import mill.eval.PathRef +import mill.api.PathRef class ScalaPBWorker { @@ -40,7 +40,7 @@ class ScalaPBWorker { } def compile(scalaPBClasspath: Agg[os.Path], scalaPBSources: Seq[os.Path], scalaPBOptions: String, dest: os.Path) - (implicit ctx: mill.util.Ctx): mill.eval.Result[PathRef] = { + (implicit ctx: mill.api.Ctx): mill.api.Result[PathRef] = { val compiler = scalaPB(scalaPBClasspath) def compileScalaPBDir(inputDir: os.Path) { @@ -55,7 +55,7 @@ class ScalaPBWorker { scalaPBSources.foreach(compileScalaPBDir) - mill.eval.Result.Success(PathRef(dest)) + mill.api.Result.Success(PathRef(dest)) } } diff --git a/contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala b/contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala index 65558f72..fe0ce8d5 100644 --- a/contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala +++ b/contrib/scalapblib/test/src/mill/contrib/scalapblib/TutorialTests.scala @@ -1,6 +1,6 @@ package mill.contrib.scalapblib -import mill.eval.Result +import mill.api.Result import mill.util.{TestEvaluator, TestUtil} import utest.framework.TestPath import utest.{TestSuite, Tests, assert, _} diff --git a/contrib/tut/test/src/mill/contrib/tut/TutTests.scala b/contrib/tut/test/src/mill/contrib/tut/TutTests.scala index 8168930f..468654bb 100644 --- a/contrib/tut/test/src/mill/contrib/tut/TutTests.scala +++ b/contrib/tut/test/src/mill/contrib/tut/TutTests.scala @@ -2,7 +2,7 @@ package mill.contrib package tut import mill._ -import mill.eval.Result._ +import mill.api.Result._ import mill.scalalib._ import mill.util.{TestEvaluator, TestUtil} import utest._ diff --git a/contrib/twirllib/src/mill/twirllib/TwirlModule.scala b/contrib/twirllib/src/mill/twirllib/TwirlModule.scala index 8f735f3a..328afc47 100644 --- a/contrib/twirllib/src/mill/twirllib/TwirlModule.scala +++ b/contrib/twirllib/src/mill/twirllib/TwirlModule.scala @@ -3,7 +3,7 @@ package twirllib import coursier.{Cache, MavenRepository} import mill.define.Sources -import mill.eval.PathRef +import mill.api.PathRef import mill.scalalib.Lib.resolveDependencies import mill.scalalib._ import mill.util.Loose @@ -41,7 +41,7 @@ trait TwirlModule extends mill.Module { private def twirlInclusiveDot: Boolean = false - def compileTwirl: T[CompilationResult] = T.persistent { + def compileTwirl: T[mill.scalalib.api.CompilationResult] = T.persistent { TwirlWorkerApi.twirlWorker .compile( twirlClasspath().map(_.path), diff --git a/contrib/twirllib/src/mill/twirllib/TwirlWorker.scala b/contrib/twirllib/src/mill/twirllib/TwirlWorker.scala index b8fe9c66..09376a6f 100644 --- a/contrib/twirllib/src/mill/twirllib/TwirlWorker.scala +++ b/contrib/twirllib/src/mill/twirllib/TwirlWorker.scala @@ -5,11 +5,10 @@ import java.io.File import java.lang.reflect.Method import java.net.URLClassLoader -import mill.eval.PathRef -import mill.scalalib.CompilationResult +import mill.api.PathRef +import mill.scalalib.api.CompilationResult import scala.io.Codec - class TwirlWorker { private var twirlInstanceCache = Option.empty[(Long, TwirlWorkerApi)] @@ -103,7 +102,7 @@ class TwirlWorker { constructorAnnotations: Seq[String], codec: Codec, inclusiveDot: Boolean) - (implicit ctx: mill.util.Ctx): mill.eval.Result[CompilationResult] = { + (implicit ctx: mill.api.Ctx): mill.api.Result[CompilationResult] = { val compiler = twirl(twirlClasspath) def compileTwirlDir(inputDir: os.Path) { @@ -127,7 +126,7 @@ class TwirlWorker { val zincFile = ctx.dest / 'zinc val classesDir = ctx.dest - mill.eval.Result.Success(CompilationResult(zincFile, PathRef(classesDir))) + mill.api.Result.Success(CompilationResult(zincFile, PathRef(classesDir))) } private def twirlExtensionFormat(name: String) = |