Bump version from 2.11 release to 2.12 series

scala · Aug 22, 2017 · 9a9761d · 9a9761d
1 parent 98488f8
commit 9a9761d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/project/Build.scala b/project/Build.scala
@@ -40,7 +40,7 @@ object Build {
   val dottyOrganization = "ch.epfl.lamp"
   val dottyGithubUrl = "https://github.com/lampepfl/dotty"
   val dottyVersion = {
-    val baseVersion = "0.3.0-RC1"
+    val baseVersion = "0.4.0"
     val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
     val isRelease = sys.env.get("RELEASEBUILD") == Some("yes")
     if (isNightly)

diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala
@@ -249,6 +249,6 @@ object DottyIDEPlugin extends AutoPlugin {
           }
       }
     }
-    
+
   ) ++ addCommandAlias("launchIDE", ";configureIDE;runCode")
 }
diff --git a/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala b/sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala
@@ -50,11 +50,15 @@ object DottyPlugin extends AutoPlugin {
       def withDottyCompat(): ModuleID =
         moduleID.crossVersion match {
           case _: CrossVersion.Binary =>
-            moduleID.cross(CrossVersion.binaryMapped {
-              // TODO: this will break on release of >= 0.4
-              case version if version.startsWith("0.3") => "2.12"
-              case version if version.startsWith("0.") => "2.11"
-              case version => version
+            moduleID.cross(CrossVersion.binaryMapped { version =>
+              CrossVersion.partialVersion(version) match {
+                case Some(0, minor) =>
+                  // Dotty v0.4 or greater is compatible with 2.12.x
+                  if (minor >= 4) "2.12"
+                  else "2.11"
+                case _ =>
+                  version
+              }
             })
           case _ =>
             moduleID