summaryrefslogtreecommitdiff
path: root/scalalib
diff options
context:
space:
mode:
authorTobias Roeser <le.petit.fou@web.de>2019-02-11 11:27:27 +0100
committerTobias Roeser <le.petit.fou@web.de>2019-02-24 11:20:48 +0100
commitd1d9d5ff7f4ca5bc44c383d5e1000674c2b4c2e2 (patch)
tree0f63da735f998bbc3997f4745de7e7bdc1eceec4 /scalalib
parent477a2968eb251acbdc434000eb37d9f256b69f99 (diff)
downloadmill-d1d9d5ff7f4ca5bc44c383d5e1000674c2b4c2e2.tar.gz
mill-d1d9d5ff7f4ca5bc44c383d5e1000674c2b4c2e2.tar.bz2
mill-d1d9d5ff7f4ca5bc44c383d5e1000674c2b4c2e2.zip
Added support for typelevel scala libraries
Fixes https://github.com/lihaoyi/mill/issues/534
Diffstat (limited to 'scalalib')
-rw-r--r--scalalib/api/src/ZincWorkerApi.scala3
1 files changed, 3 insertions, 0 deletions
diff --git a/scalalib/api/src/ZincWorkerApi.scala b/scalalib/api/src/ZincWorkerApi.scala
index d42be9f3..70128e8d 100644
--- a/scalalib/api/src/ZincWorkerApi.scala
+++ b/scalalib/api/src/ZincWorkerApi.scala
@@ -66,12 +66,15 @@ object Util{
private val ReleaseVersion = raw"""(\d+)\.(\d+)\.(\d+)""".r
private val MinorSnapshotVersion = raw"""(\d+)\.(\d+)\.([1-9]\d*)-SNAPSHOT""".r
private val DottyVersion = raw"""0\.(\d+)\.(\d+).*""".r
+ private val TypelevelVersion = raw"""(\d+)\.(\d+)\.(\d+)-bin-typelevel.*""".r
+
def scalaBinaryVersion(scalaVersion: String) = {
scalaVersion match {
case ReleaseVersion(major, minor, _) => s"$major.$minor"
case MinorSnapshotVersion(major, minor, _) => s"$major.$minor"
case DottyVersion(minor, _) => s"0.$minor"
+ case TypelevelVersion(major, minor, _) => s"$major.$minor"
case _ => scalaVersion
}
}