Merge pull request #106 from eed3si9n/fport/3152

[fport] Fix default scalaBinaryVersion for Dotty
This commit is contained in:
eugene yokota 2017-05-27 00:19:20 -04:00 committed by GitHub
commit 5558a13cd4
2 changed files with 14 additions and 3 deletions

View File

@ -8,7 +8,8 @@ object CrossVersionUtil {
val noneString = "none"
val disabledString = "disabled"
val binaryString = "binary"
val TransitionScalaVersion = "2.10"
val TransitionDottyVersion = "" // Dotty always respects binary compatibility
val TransitionScalaVersion = "2.10" // ...but scalac doesn't until Scala 2.10
val TransitionSbtVersion = "0.12"
def isFull(s: String): Boolean = (s == trueString) || (s == fullString)
@ -61,8 +62,15 @@ object CrossVersionUtil {
case PartialVersion(major, minor) => Some((major.toInt, minor.toInt))
case _ => None
}
def binaryScalaVersion(full: String): String =
binaryVersionWithApi(full, TransitionScalaVersion)(scalaApiVersion)
def binaryScalaVersion(full: String): String = {
val cutoff =
if (full.startsWith("0."))
TransitionDottyVersion
else
TransitionScalaVersion
binaryVersionWithApi(full, cutoff)(scalaApiVersion)
}
def binarySbtVersion(full: String): String =
binaryVersionWithApi(full, TransitionSbtVersion)(sbtApiVersion)
private[sbt] def binaryVersion(full: String, cutoff: String): String =

View File

@ -117,6 +117,9 @@ class CrossVersionTest extends UnitSpec {
it should "return binary Scala version for 2.20170314093845.0-87654321 as 2.20170314093845.0-87654321" in {
CrossVersion.binaryScalaVersion("2.20170314093845.0-87654321") shouldBe "2.20170314093845.0-87654321"
}
it should "return binary Scala version for Dotty 0.1.1 as 0.1" in {
CrossVersion.binaryScalaVersion("0.1.1") shouldBe "0.1"
}
it should "return patch Scala version for 2.11.8 as 2.11.8" in {
CrossVersion(CrossVersion.patch, "2.11.8", "dummy").map(_("artefact")) shouldBe Some(
"artefact_2.11.8")