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

Allow pre-release versions to be compatible with normal versions

This commit is contained in:
Dale Wijnand 2018-04-03 17:48:26 +01:00
parent 0f93849214
commit 79e31a3e0f
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
2 changed files with 12 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
core/src/main/scala/sbt/librarymanagement/VersionNumber.scala
View File

@ -129,41 +129,27 @@ object VersionNumber {
* Rule 2 we enforce with custom extractors.
* Rule 4 we enforce by matching x = 0 & fully equals checking the two versions
* Rule 6, 7 & 8 means version compatibility is determined by comparing the two X values
* Rule 9 means pre-release versions are fully equals checked
*/
def isCompatible(v1: VersionNumber, v2: VersionNumber): Boolean =
doIsCompat(dropBuildMetadata(v1), dropBuildMetadata(v2))
private[this] def doIsCompat(v1: VersionNumber, v2: VersionNumber): Boolean =
(v1, v2) match {
case (NormalVersion(0, _, _), NormalVersion(0, _, _)) => v1 == v2 // R4
case (NormalVersion(x1, _, _), NormalVersion(x2, _, _)) => x1 == x2 // R6, R7 & R8
case (PrereleaseVersion(_, _, _), PrereleaseVersion(_, _, _)) => v1 == v2 // R9
case _ => false
case (NormalVersion(0, _, _), NormalVersion(0, _, _)) => v1 == v2 // R4
case (NormalVersion(x1, _, _), NormalVersion(x2, _, _)) => x1 == x2 // R6, R7 & R8
case _ => false
}
// SemVer Spec Rule 10 (above)
private[VersionNumber] def dropBuildMetadata(v: VersionNumber) =
if (v.extras.isEmpty) v else VersionNumber(v.numbers, v.tags, Nil)
// SemVer Spec Rule 9 (above)
private[VersionNumber] def isPrerelease(v: VersionNumber): Boolean = v.tags.nonEmpty
// An extractor for SemVer's "normal version number" - SemVer Spec Rule 2 & Rule 9 (above)
private[VersionNumber] object NormalVersion {
def unapply(v: VersionNumber): Option[(Long, Long, Long)] =
PartialFunction.condOpt(v.numbers) {
// NOTE! We allow the z to be missing, because of legacy like commons-io 1.3
case Seq(x, y, _*) if !isPrerelease(v) => (x, y, v._3 getOrElse 0)
}
}
// An extractor for SemVer's "pre-release versions" - SemVer Spec Rule 2 & Rule 9 (above)
private[VersionNumber] object PrereleaseVersion {
def unapply(v: VersionNumber): Option[(Long, Long, Long)] =
PartialFunction.condOpt(v.numbers) {
// NOTE! We allow the z to be missing, because of legacy like commons-io 1.3
case Seq(x, y, _*) if isPrerelease(v) => (x, y, v._3 getOrElse 0)
case Seq(x, y, _*) => (x, y, v._3 getOrElse 0)
}
}
}
@ -182,9 +168,8 @@ object VersionNumber {
private[this] def doIsCompat(v1: VersionNumber, v2: VersionNumber): Boolean = {
(v1, v2) match {
case (NormalVersion(x1, y1, _), NormalVersion(x2, y2, _)) => (x1 == x2) && (y1 == y2)
case (PrereleaseVersion(_, _, _), PrereleaseVersion(_, _, _)) => v1 == v2 // R2 & R9
case _ => false
case (NormalVersion(x1, y1, _), NormalVersion(x2, y2, _)) => (x1 == x2) && (y1 == y2)
case _ => false
}
}
}

12
core/src/test/scala/sbt/librarymanagement/VersionNumberSpec.scala
View File

@ -26,12 +26,12 @@ class VersionNumberSpec extends FreeSpec with Matchers with Inside {
assertIsCompatibleWith(v, "1.0.1", SemVer)
assertIsCompatibleWith(v, "1.1.1", SemVer)
assertIsNotCompatibleWith(v, "2.0.0", SemVer)
assertIsNotCompatibleWith(v, "1.0.0-M1", SemVer)
assertIsCompatibleWith(v, "1.0.0-M1", SemVer)
assertIsCompatibleWith(v, "1.0.1", SecondSegment)
assertIsNotCompatibleWith(v, "1.1.1", SecondSegment)
assertIsNotCompatibleWith(v, "2.0.0", SecondSegment)
assertIsNotCompatibleWith(v, "1.0.0-M1", SecondSegment)
assertIsCompatibleWith(v, "1.0.0-M1", SecondSegment)
}
version("1.0.0.0") { v =>
@ -49,9 +49,9 @@ class VersionNumberSpec extends FreeSpec with Matchers with Inside {
assertIsNotCompatibleWith(v, "0.12.1", SemVer)
assertIsNotCompatibleWith(v, "0.12.1-M1", SemVer)
assertIsNotCompatibleWith(v, "0.12.0-RC1", SecondSegment)
assertIsCompatibleWith(v, "0.12.0-RC1", SecondSegment)
assertIsCompatibleWith(v, "0.12.1", SecondSegment)
assertIsNotCompatibleWith(v, "0.12.1-M1", SecondSegment)
assertIsCompatibleWith(v, "0.12.1-M1", SecondSegment)
}
version("0.1.0-SNAPSHOT") { v =>
@ -63,7 +63,7 @@ class VersionNumberSpec extends FreeSpec with Matchers with Inside {
assertIsCompatibleWith(v, "0.1.0-SNAPSHOT+001", SemVer)
assertIsCompatibleWith(v, "0.1.0-SNAPSHOT", SecondSegment)
assertIsNotCompatibleWith(v, "0.1.0", SecondSegment)
assertIsCompatibleWith(v, "0.1.0", SecondSegment)
assertIsCompatibleWith(v, "0.1.0-SNAPSHOT+001", SecondSegment)
}
@ -85,7 +85,7 @@ class VersionNumberSpec extends FreeSpec with Matchers with Inside {
version("2.10.4-20140115-000117-b3a-sources") { v =>
assertParsesTo(v, Seq(2, 10, 4), Seq("20140115", "000117", "b3a", "sources"), Seq())
assertCascadesTo(v, Seq("2.10.4-20140115-000117-b3a-sources", "2.10.4", "2.10"))
assertIsNotCompatibleWith(v, "2.0.0", SemVer)
assertIsCompatibleWith(v, "2.0.0", SemVer)
assertIsNotCompatibleWith(v, "2.0.0", SecondSegment)
}