diff options
author | Guillaume Martres <smarter@ubuntu.com> | 2019-09-09 19:58:15 +0200 |
---|---|---|
committer | Tobias Roeser <le.petit.fou@web.de> | 2019-09-09 19:58:15 +0200 |
commit | f9a9991687d6aa70e50ff2ec5ad4d9e039b7f723 (patch) | |
tree | 6a9a0dc4dcef369e3757abbab28ea7985616d101 /scalalib/api/src | |
parent | e6f6a9559b79cf6ade1a85b483119ee8b5b37abb (diff) | |
download | mill-f9a9991687d6aa70e50ff2ec5ad4d9e039b7f723.tar.gz mill-f9a9991687d6aa70e50ff2ec5ad4d9e039b7f723.tar.bz2 mill-f9a9991687d6aa70e50ff2ec5ad4d9e039b7f723.zip |
Properly support Dotty >= 0.18.1 (#682)
Dotty now uses the 2.13 standard library, so `withDottyCompat` needs to
use the correct suffix depending on the Dotty version.
Diffstat (limited to 'scalalib/api/src')
-rw-r--r-- | scalalib/api/src/ZincWorkerApi.scala | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/scalalib/api/src/ZincWorkerApi.scala b/scalalib/api/src/ZincWorkerApi.scala index 418b18c6..53a98c24 100644 --- a/scalalib/api/src/ZincWorkerApi.scala +++ b/scalalib/api/src/ZincWorkerApi.scala @@ -64,11 +64,12 @@ object Util { .getOrElse(throw new Exception(s"Cannot find $mavenStylePath or $ivyStylePath in ${classPath.mkString("[", ", ", "]")}")) } - private val ReleaseVersion = raw"""(\d+)\.(\d+)\.(\d+)""".r - private val MinorSnapshotVersion = raw"""(\d+)\.(\d+)\.([1-9]\d*)-SNAPSHOT""".r - private val DottyVersion = raw"""(0|3)\.(\d+)\.(\d+).*""".r - private val DottyNightlyVersion = raw"""(0|3)\.(\d+)\.(\d+)-bin-(.*)-NIGHTLY""".r - private val TypelevelVersion = raw"""(\d+)\.(\d+)\.(\d+)-bin-typelevel.*""".r + val PartialVersion = raw"""(\d+)\.(\d+)\.*""".r + val ReleaseVersion = raw"""(\d+)\.(\d+)\.(\d+)""".r + val MinorSnapshotVersion = raw"""(\d+)\.(\d+)\.([1-9]\d*)-SNAPSHOT""".r + val DottyVersion = raw"""(0|3)\.(\d+)\.(\d+).*""".r + val DottyNightlyVersion = raw"""(0|3)\.(\d+)\.(\d+)-bin-(.*)-NIGHTLY""".r + val TypelevelVersion = raw"""(\d+)\.(\d+)\.(\d+)-bin-typelevel.*""".r def scalaBinaryVersion(scalaVersion: String) = scalaVersion match { |