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

Merge pull request #377 from Nirvikalpa108/fix-6496 

Fixes sbt/sbt#6496 - bug in version parser
This commit is contained in:
eugene yokota 2021-05-14 20:48:26 -04:00 committed by GitHub
parent 4c19b9cc7c 6f87212b9f
commit af46c23d5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -66,7 +66,7 @@ object VersionNumber {
def splitDash(s: String) = splitOn(s, '-')
def splitPlus(s: String) = splitOn(s, '+') map ("+" + _)
val TaggedVersion = """(\d{1,14})([\.\d{1,14}]*)((?:-\w+)*)((?:\+.+)*)""".r
val TaggedVersion = """(\d{1,14})([\.\d{1,14}]*)((?:-[\w\.]+)*)((?:\+.+)*)""".r
val NonSpaceString = """(\S+)""".r
s match {

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

@ -97,6 +97,13 @@ class VersionNumberSpec extends AnyFreeSpec with Matchers with Inside {
assertCascadesTo(v, Seq("0.1.0-MSERVER-1", "0.1.0", "0.1"))
}
version("1.1.0-DLP-7923-presigned-download-url.5") { v =>
assertParsesTo(v, Seq(1, 1, 0), Seq("DLP", "7923", "presigned", "download", "url.5"), Seq())
assertCascadesTo(v, Seq("1.1.0-DLP-7923-presigned-download-url.5", "1.1.0", "1.1"))
assertIsCompatibleWith(v, "1.0.7", EarlySemVer)
assertIsNotCompatibleWith(v, "1.0.7", PackVer)
}
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"))