diff options
| -rwxr-xr-x | build.sc | 11 | ||||
| -rw-r--r-- | contrib/playlib/api/src/Versions.scala | 4 | ||||
| -rw-r--r-- | contrib/playlib/src/mill/playlib/Version.scala | 2 | ||||
| -rw-r--r-- | contrib/playlib/worker/2.6/src/RouteCompilerWorker.scala (renamed from contrib/playlib/worker/2.6.0/src/RouteCompilerWorker.scala) | 0 | ||||
| -rw-r--r-- | contrib/playlib/worker/2.7/src/RouteCompilerWorker.scala (renamed from contrib/playlib/worker/2.7.0/src/RouteCompilerWorker.scala) | 0 |
5 files changed, 8 insertions, 9 deletions
@@ -252,8 +252,8 @@ object contrib extends MillModule { def testArgs = T { val mapping = Map( - "MILL_CONTRIB_PLAYLIB_ROUTECOMPILER_WORKER_2_6_0" -> worker("2.6.0").compile().classes.path, - "MILL_CONTRIB_PLAYLIB_ROUTECOMPILER_WORKER_2_7_0" -> worker("2.7.0").compile().classes.path + "MILL_CONTRIB_PLAYLIB_ROUTECOMPILER_WORKER_2_6" -> worker("2.6").compile().classes.path, + "MILL_CONTRIB_PLAYLIB_ROUTECOMPILER_WORKER_2_7" -> worker("2.7").compile().classes.path ) scalalib.worker.testArgs() ++ @@ -264,18 +264,17 @@ object contrib extends MillModule { object api extends MillApiModule { def moduleDeps = Seq(scalalib) } - - object worker extends Cross[WorkerModule]( "2.6.0", "2.7.0") + object worker extends Cross[WorkerModule]( "2.6", "2.7") class WorkerModule(scalajsBinary: String) extends MillApiModule { def moduleDeps = Seq(playlib.api) def ivyDeps = scalajsBinary match { - case "2.6.0" => + case "2.6"=> Agg( ivy"com.typesafe.play::routes-compiler::2.6.0" ) - case "2.7.0" => + case "2.7" => Agg( ivy"com.typesafe.play::routes-compiler::2.7.0" ) diff --git a/contrib/playlib/api/src/Versions.scala b/contrib/playlib/api/src/Versions.scala index 25e7026e..8c58f6e0 100644 --- a/contrib/playlib/api/src/Versions.scala +++ b/contrib/playlib/api/src/Versions.scala @@ -2,6 +2,6 @@ package mill package playlib package api object Versions { - val PLAY_2_6="2.6.0" - val PLAY_2_7="2.7.0" + val PLAY_2_6="2.6" + val PLAY_2_7="2.7" } diff --git a/contrib/playlib/src/mill/playlib/Version.scala b/contrib/playlib/src/mill/playlib/Version.scala index ae441a8a..24e11666 100644 --- a/contrib/playlib/src/mill/playlib/Version.scala +++ b/contrib/playlib/src/mill/playlib/Version.scala @@ -9,7 +9,7 @@ private[playlib] trait Version extends Module{ def playVersion: T[String] private[playlib] def playMinorVersion: T[String] = T { - playVersion().split("\\.").take(2).mkString("", ".", ".0") + playVersion().split("\\.").take(2).mkString(".") } private[playlib] def component(id: String): Task[Dep] = T.task { diff --git a/contrib/playlib/worker/2.6.0/src/RouteCompilerWorker.scala b/contrib/playlib/worker/2.6/src/RouteCompilerWorker.scala index 83de5e42..83de5e42 100644 --- a/contrib/playlib/worker/2.6.0/src/RouteCompilerWorker.scala +++ b/contrib/playlib/worker/2.6/src/RouteCompilerWorker.scala diff --git a/contrib/playlib/worker/2.7.0/src/RouteCompilerWorker.scala b/contrib/playlib/worker/2.7/src/RouteCompilerWorker.scala index 3e5a1b68..3e5a1b68 100644 --- a/contrib/playlib/worker/2.7.0/src/RouteCompilerWorker.scala +++ b/contrib/playlib/worker/2.7/src/RouteCompilerWorker.scala |