luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #384 from adpi2/fix-6585 

Fix Scala 3 binary version
This commit is contained in:
eugene yokota 2021-07-08 23:25:39 -04:00 committed by GitHub
parent 40a2166318 37234e35ba
commit 5ef0af2486
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala
View File

@ -76,11 +76,12 @@ object CrossVersionUtil {
}
private[sbt] def binaryScala3Version(full: String): String = full match {
case ReleaseV(maj, _, _, _) => maj
case CandidateV(maj, min, patch, _) if min.toLong > 0 || patch.toLong > 0 => maj
case MilestonV(maj, min, patch, _) if min.toLong > 0 || patch.toLong > 0 => maj
case BinCompatV(maj, min, patch, stage, _) => binaryScala3Version(s"$maj.$min.$patch$stage")
case _ => full
case ReleaseV(maj, _, _, _) => maj
case NonReleaseV_n(maj, min, patch, _) if min.toLong > 0 || patch.toLong > 0 => maj
case BinCompatV(maj, min, patch, stageOrNull, _) =>
val stage = if (stageOrNull != null) stageOrNull else ""
binaryScala3Version(s"$maj.$min.$patch$stage")
case _ => full
}
def binaryScalaVersion(full: String): String = {

8
core/src/test/scala/sbt/librarymanagement/CrossVersionTest.scala
View File

@ -250,7 +250,13 @@ class CrossVersionTest extends UnitSpec {
binaryScalaVersion("3.0.1-M1") shouldBe "3"
}
it should "for 3.0.1-RC1-bin-SNAPSHOT return 3" in {
binaryScalaVersion("3.0.1-RC1") shouldBe "3"
binaryScalaVersion("3.0.1-RC1-bin-SNAPSHOT") shouldBe "3"
}
it should "for 3.0.1-bin-nonbootstrapped return 3" in {
binaryScalaVersion("3.0.1-bin-SNAPSHOT") shouldBe "3"
}
it should "for 3.0.1-SNAPSHOT return 3" in {
binaryScalaVersion("3.0.1-SNAPSHOT") shouldBe "3"
}
private def patchVersion(fullVersion: String) =