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

Clarify NonRelease variants in CrossVersion

This commit is contained in:
Dale Wijnand 2017-06-09 11:49:12 +01:00
parent 1bbc4719c6
commit f98ee86668
No known key found for this signature in database
GPG Key ID: 4F256E3D151DF5EF
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,8 @@ object CrossVersionUtil {
private val ReleaseV = raw"""$basicVersion(-\d+)?""".r
private val BinCompatV = raw"""$basicVersion-bin(-.*)?""".r
private val CandidateV = raw"""$basicVersion(-RC\d+)""".r
private val NonReleaseV_1 = raw"""$basicVersion([-\w+]*)""".r
private val NonReleaseV_2 = raw"""$basicVersion(-\w+)""".r
private val NonReleaseV_n = raw"""$basicVersion([-\w]*)""".r // 0-n word suffixes, with leading dashes
private val NonReleaseV_1 = raw"""$basicVersion(-\w+)""".r // 1 word suffix, after a dash
private[sbt] val PartialVersion = raw"""($intPattern)\.($intPattern)(?:\..+)?""".r
private[sbt] def isSbtApiCompatible(v: String): Boolean = sbtApiVersion(v).isDefined
@ -38,7 +38,7 @@ object CrossVersionUtil {
private[sbt] def sbtApiVersion(v: String): Option[(Int, Int)] = v match {
case ReleaseV(x, y, _, _) => Some((x.toInt, y.toInt))
case CandidateV(x, y, _, _) => Some((x.toInt, y.toInt))
case NonReleaseV_1(x, y, z, _) if z.toInt > 0 => Some((x.toInt, y.toInt))
case NonReleaseV_n(x, y, z, _) if z.toInt > 0 => Some((x.toInt, y.toInt))
case _ => None
}
@ -51,7 +51,7 @@ object CrossVersionUtil {
private[sbt] def scalaApiVersion(v: String): Option[(Int, Int)] = v match {
case ReleaseV(x, y, _, _) => Some((x.toInt, y.toInt))
case BinCompatV(x, y, _, _) => Some((x.toInt, y.toInt))
case NonReleaseV_2(x, y, z, _) if z.toInt > 0 => Some((x.toInt, y.toInt))
case NonReleaseV_1(x, y, z, _) if z.toInt > 0 => Some((x.toInt, y.toInt))
case _ => None
}