From d1d9d5ff7f4ca5bc44c383d5e1000674c2b4c2e2 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Mon, 11 Feb 2019 11:27:27 +0100 Subject: Added support for typelevel scala libraries Fixes https://github.com/lihaoyi/mill/issues/534 --- scalalib/api/src/ZincWorkerApi.scala | 3 +++ 1 file changed, 3 insertions(+) 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 } } -- cgit v1.2.3