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

Merge pull request #374 from adpi2/fix-6420 

Fix binary version of 3.0.1-RC1
This commit is contained in:
eugene yokota 2021-03-30 14:17:57 -04:00 committed by GitHub
parent 23b7d923af c98e51418f
commit f2ed2224ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,11 +75,11 @@ object CrossVersionUtil {
}
private[sbt] def binaryScala3Version(full: String): String = full match {
case ReleaseV(maj, _, _, _) => maj
case CandidateV(maj, min, _, _) if min.toLong > 0 => maj
case MilestonV(maj, min, _, _) if min.toLong > 0 => maj
case BinCompatV(maj, min, patch, stage, _) => binaryScala3Version(s"$maj.$min.$patch$stage")
case _ => full
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
}
def binaryScalaVersion(full: String): String = {

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

@ -237,6 +237,15 @@ class CrossVersionTest extends UnitSpec {
it should "for 3.1.0 return 3" in {
binaryScalaVersion("3.1.0") shouldBe "3"
}
it should "for 3.0.1-RC1 return 3" in {
binaryScalaVersion("3.0.1-RC1") shouldBe "3"
}
it should "for 3.0.1-M1 return 3" in {
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"
}
private def patchVersion(fullVersion: String) =
CrossVersion(CrossVersion.patch, fullVersion, "dummy") map (fn => fn("artefact"))