Skip to content

Commit c5c3b8f

Browse files
committed
Bump version from 2.11 release to 2.12 series
1 parent 98488f8 commit c5c3b8f

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

project/Build.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ object Build {
4040
val dottyOrganization = "ch.epfl.lamp"
4141
val dottyGithubUrl = "https://github.com/lampepfl/dotty"
4242
val dottyVersion = {
43-
val baseVersion = "0.3.0-RC1"
43+
val baseVersion = "0.4.0"
4444
val isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
4545
val isRelease = sys.env.get("RELEASEBUILD") == Some("yes")
4646
if (isNightly)

sbt-dotty/src/dotty/tools/sbtplugin/DottyIDEPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -249,6 +249,6 @@ object DottyIDEPlugin extends AutoPlugin {
249249
}
250250
}
251251
}
252-
252+
253253
) ++ addCommandAlias("launchIDE", ";configureIDE;runCode")
254254
}

sbt-dotty/src/dotty/tools/sbtplugin/DottyPlugin.scala

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,15 @@ object DottyPlugin extends AutoPlugin {
5050
def withDottyCompat(): ModuleID =
5151
moduleID.crossVersion match {
5252
case _: CrossVersion.Binary =>
53-
moduleID.cross(CrossVersion.binaryMapped {
54-
// TODO: this will break on release of >= 0.4
55-
case version if version.startsWith("0.3") => "2.12"
56-
case version if version.startsWith("0.") => "2.11"
57-
case version => version
53+
moduleID.cross(CrossVersion.binaryMapped { version =>
54+
CrossVersion.partialVersion(version) match {
55+
case Some((0, minor)) =>
56+
// Dotty v0.4 or greater is compatible with 2.12.x
57+
if (minor >= 4) "2.12"
58+
else "2.11"
59+
case _ =>
60+
version
61+
}
5862
})
5963
case _ =>
6064
moduleID

0 commit comments

Comments
 (0)