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

Merge pull request #556 from avdv/support-latest-subrevision 

Support latest subrevision
This commit is contained in:
Alexandre Archambault 2017-06-09 18:09:32 +02:00 committed by GitHub
parent f6493a2d5a 2851f7d364
commit 6c9ee0b647
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
core/shared/src/main/scala/coursier/core/Parse.scala
View File

@ -11,23 +11,28 @@ object Parse {
else Some(Version(trimmed))
}
// matches revisions with a '+' appended, e.g. "1.2.+", "1.2+" or "1.2.3-+"
private val latestSubRevision = "(.*[^.-])[.-]?[+]".r
def ivyLatestSubRevisionInterval(s: String): Option[VersionInterval] =
if (s.endsWith(".+")) {
for {
from <- version(s.stripSuffix(".+"))
if from.rawItems.nonEmpty
last <- Some(from.rawItems.last).collect { case n: Version.Numeric => n }
// a bit loose, but should do the job
if from.repr.endsWith(last.repr)
// appending -a1 to the next version, so has not to include things like
// nextVersion-RC1 in the interval - nothing like nextVersion* should be included
to <- version(from.repr.stripSuffix(last.repr) + last.next.repr + "-a1")
// the contrary would mean something went wrong in the loose substitution above
if from.rawItems.init == to.rawItems.dropRight(2).init
if to.rawItems.takeRight(2) == Seq(Version.Literal("a"), Version.Number(1))
} yield VersionInterval(Some(from), Some(to), fromIncluded = true, toIncluded = false)
} else
None
s match {
case latestSubRevision(prefix) =>
for {
from <- version(prefix)
if from.rawItems.nonEmpty
last <- Some(from.rawItems.last).collect { case n: Version.Numeric => n }
// a bit loose, but should do the job
if from.repr.endsWith(last.repr)
// appending -a1 to the next version, so has not to include things like
// nextVersion-RC1 in the interval - nothing like nextVersion* should be included
to <- version(from.repr.stripSuffix(last.repr) + last.next.repr + "-a1")
// the contrary would mean something went wrong in the loose substitution above
if from.rawItems.init == to.rawItems.dropRight(2).init
if to.rawItems.takeRight(2) == Seq(Version.Literal("a"), Version.Number(1))
} yield VersionInterval(Some(from), Some(to), fromIncluded = true, toIncluded = false)
case _ =>
None
}
def versionInterval(s: String): Option[VersionInterval] = {

4
tests/shared/src/test/scala/coursier/test/VersionConstraintTests.scala
View File

@ -20,6 +20,10 @@ object VersionConstraintTests extends TestSuite {
val c0 = Parse.versionConstraint("(,1.2]")
assert(c0 == Some(VersionConstraint.interval(VersionInterval(None, Some(Version("1.2")), false, true))))
}
'latestSubRevision{
val c0 = Parse.versionConstraint("1.2.3-+")
assert(c0 == Some(VersionConstraint.interval(VersionInterval(Some(Version("1.2.3")), Some(Version("1.2.4-a1")), true, false))))
}
}
'repr{