From dca05d702bb53b562570f70c30d7767e81c29a76 Mon Sep 17 00:00:00 2001 From: Jean Helou Date: Mon, 25 Feb 2019 16:26:04 +0100 Subject: fixes route compiler worker selector key The version was correctly derived into a worker key but the key was left unused and the full version was used instead which didn't work for non .0 versions --- contrib/playlib/src/mill/playlib/RouterModule.scala | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/playlib/src/mill/playlib/RouterModule.scala b/contrib/playlib/src/mill/playlib/RouterModule.scala index 22912453..abf3082b 100644 --- a/contrib/playlib/src/mill/playlib/RouterModule.scala +++ b/contrib/playlib/src/mill/playlib/RouterModule.scala @@ -73,15 +73,14 @@ trait RouterModule extends ScalaModule with Version { } private def playRouteCompilerWorkerClasspath = T { - val workerKey = "MILL_CONTRIB_PLAYLIB_ROUTECOMPILER_WORKER_" + playMinorVersion().replace(".", - "_") + val workerKey = "MILL_CONTRIB_PLAYLIB_ROUTECOMPILER_WORKER_" + playMinorVersion().replace(".", "_") //While the following seems to work (tests pass), I am not completely //confident that the strings I used for artifact and resolveFilter are //actually correct mill.modules.Util.millProjectModule( workerKey, - s"mill-contrib-playlib-worker-${playVersion()}", + s"mill-contrib-playlib-worker-${playMinorVersion()}", repositories, resolveFilter = _.toString.contains("mill-contrib-playlib-worker") ) -- cgit v1.2.3