diff options
| author | Jean Helou <jhe@codamens.fr> | 2019-02-07 00:04:06 +0100 |
|---|---|---|
| committer | Tobias Roeser <le.petit.fou@web.de> | 2019-02-14 17:45:16 +0100 |
| commit | b095094c40cdcd99fa65aeb3fe78390334c0636e (patch) | |
| tree | bfc6c161b8ca1dc5f93b12fde97e9b87ec514d96 /contrib | |
| parent | ad5667c0f9ce9d3daddd961b5bf2482e2a48ff33 (diff) | |
| download | mill-b095094c40cdcd99fa65aeb3fe78390334c0636e.tar.gz mill-b095094c40cdcd99fa65aeb3fe78390334c0636e.tar.bz2 mill-b095094c40cdcd99fa65aeb3fe78390334c0636e.zip | |
rebase on master
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/playlib/src/mill/playlib/RouterGeneratorWorker.scala | 6 | ||||
| -rw-r--r-- | 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 { |