diff options
Diffstat (limited to 'contrib/twirllib')
-rw-r--r-- | contrib/twirllib/src/mill/twirllib/TwirlModule.scala | 4 | ||||
-rw-r--r-- | contrib/twirllib/src/mill/twirllib/TwirlWorker.scala | 9 |
2 files changed, 6 insertions, 7 deletions
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) = |