From f5458e25063c880ed13cec1a742f33cbc9a738dd Mon Sep 17 00:00:00 2001 From: Jean Helou Date: Tue, 26 Feb 2019 23:12:08 +0100 Subject: Reworks version specific keys and extraction Route compilation workers are specific to play minor version but still added a patch level version in the key. The playMinorVersion used to compute the version part of the key had to add a useless trailing `.0`, this is now fixed. --- build.sc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'build.sc') diff --git a/build.sc b/build.sc index 992210bd..65f68c51 100755 --- a/build.sc +++ b/build.sc @@ -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" ) -- cgit v1.2.3