diff options
| author | Jean Helou <jhe@codamens.fr> | 2019-02-26 23:12:08 +0100 |
|---|---|---|
| committer | Tobias Roeser <le.petit.fou@web.de> | 2019-03-11 07:41:03 +0100 |
| commit | f5458e25063c880ed13cec1a742f33cbc9a738dd (patch) | |
| tree | 8968d408a7b1c9b9fb840f203a793b5222e0fb4a /contrib | |
| parent | 2cac5a37351f4ec13c5b29d8bd292a7153762e87 (diff) | |
| download | mill-f5458e25063c880ed13cec1a742f33cbc9a738dd.tar.gz mill-f5458e25063c880ed13cec1a742f33cbc9a738dd.tar.bz2 mill-f5458e25063c880ed13cec1a742f33cbc9a738dd.zip | |
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.
Diffstat (limited to 'contrib')
| -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 |
4 files changed, 3 insertions, 3 deletions
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 |