From b095094c40cdcd99fa65aeb3fe78390334c0636e Mon Sep 17 00:00:00 2001 From: Jean Helou Date: Thu, 7 Feb 2019 00:04:06 +0100 Subject: rebase on master --- contrib/playlib/src/mill/playlib/RouterGeneratorWorker.scala | 6 +++--- contrib/playlib/src/mill/playlib/RouterModule.scala | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/contrib/playlib/src/mill/playlib/RouterGeneratorWorker.scala b/contrib/playlib/src/mill/playlib/RouterGeneratorWorker.scala index a246bf2a..35eaf047 100644 --- a/contrib/playlib/src/mill/playlib/RouterGeneratorWorker.scala +++ b/contrib/playlib/src/mill/playlib/RouterGeneratorWorker.scala @@ -6,7 +6,7 @@ import java.net.URLClassLoader import ammonite.ops.Path import mill.eval.PathRef -import mill.scalalib.CompilationResult +import mill.scalalib.api.CompilationResult import scala.collection.JavaConverters._ @@ -15,7 +15,7 @@ class RouterGeneratorWorker { private var routerGeneratorInstances = Option.empty[(Long, RouterGeneratorWorkerApi)] private def router(routerClasspath: Agg[Path]) = { - val classloaderSig = routerClasspath.map(p => p.toString().hashCode + p.mtime.toMillis).sum + val classloaderSig = routerClasspath.map(p => p.toString().hashCode + os.mtime(p)).sum routerGeneratorInstances match { case Some((sig, instance)) if sig == classloaderSig => instance case _ => @@ -73,7 +73,7 @@ class RouterGeneratorWorker { .asInstanceOf[java.util.List[File]] Right(filesJava.asScala) case "scala.util.Left" => - // TODO: convert the error of type RoutesCompilationError to a CompilationResult + // TODO: convert the error of type RoutesCompilationError to a CompilationResult Left(Seq(CompilationResult(Path(""), PathRef(Path(""))))) } } diff --git a/contrib/playlib/src/mill/playlib/RouterModule.scala b/contrib/playlib/src/mill/playlib/RouterModule.scala index 947e895b..a7073492 100644 --- a/contrib/playlib/src/mill/playlib/RouterModule.scala +++ b/contrib/playlib/src/mill/playlib/RouterModule.scala @@ -2,9 +2,11 @@ package mill package playlib import coursier.{Cache, MavenRepository} -import mill.scalalib.Lib.resolveDependencies -import mill.scalalib._ -import mill.util.Loose +import scalalib.Lib +import scalalib.Lib.resolveDependencies +import scalalib.api._ +import scalalib._ +import mill.api.Loose trait RouterModule extends mill.Module { -- cgit v1.2.3