diff options
author | Nikolay Tatarinov <5min4eq.unity@gmail.com> | 2018-03-20 18:20:38 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-03-20 18:20:38 +0300 |
commit | cb30f1c42c818b2a2b1e216823ca09c8430da5f9 (patch) | |
tree | d1f7e50547ab10c28bff562924a53c31a86e728c /scalajslib/src | |
parent | 672642e4694088c2c0aee6e408de079318bcd4db (diff) | |
download | mill-cb30f1c42c818b2a2b1e216823ca09c8430da5f9.tar.gz mill-cb30f1c42c818b2a2b1e216823ca09c8430da5f9.tar.bz2 mill-cb30f1c42c818b2a2b1e216823ca09c8430da5f9.zip |
Support scala milestone releases (with fixes for 2.13.0-M3) (#247)
* return full scala version for milestone releases
* complete support for scala 2.13.0-M2
* match 2.13 milestone releases for compiler bridge sources
* add hello world test case for scala 2.13.0-M3
Diffstat (limited to 'scalajslib/src')
-rw-r--r-- | scalajslib/src/mill/scalajslib/ScalaJSModule.scala | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala index 3b566e13..11b9eaf8 100644 --- a/scalajslib/src/mill/scalajslib/ScalaJSModule.scala +++ b/scalajslib/src/mill/scalajslib/ScalaJSModule.scala @@ -7,7 +7,7 @@ import coursier.maven.MavenRepository import mill.eval.{PathRef, Result} import mill.eval.Result.Success import mill.scalalib.Lib.resolveDependencies -import mill.scalalib.{CompilationResult, Dep, DepSyntax, TestModule} +import mill.scalalib.{DepSyntax, Lib, TestModule} import mill.util.{Ctx, Loose} trait ScalaJSModule extends scalalib.ScalaModule { outer => @@ -21,16 +21,7 @@ trait ScalaJSModule extends scalalib.ScalaModule { outer => override def moduleDeps = Seq(outer) } - private val ReleaseVersion = raw"""(\d+)\.(\d+)\.(\d+)""".r - private val MinorSnapshotVersion = raw"""(\d+)\.(\d+)\.([1-9]\d*)-SNAPSHOT""".r - - def scalaJSBinaryVersion = T{ - scalaJSVersion() match { - case ReleaseVersion(major, minor, _) => s"$major.$minor" - case MinorSnapshotVersion(major, minor, _) => s"$major.$minor" - case _ => scalaJSVersion() - } - } + def scalaJSBinaryVersion = T { Lib.scalaBinaryVersion(scalaJSVersion()) } def scalaJSBridgeVersion = T{ scalaJSVersion().split('.').dropRight(1).mkString(".") } |