mirror of
https://github.com/sbt/sbt.git
synced 2026-09-06 17:40:06 +02:00
Regex now handles versions that contain multiple '-' characters in the version.
This commit is contained in:
@@ -24,7 +24,7 @@ object CrossVersionUtil
|
||||
{
|
||||
val ReleaseV = """(\d+)\.(\d+)\.(\d+)(-\d+)?""".r
|
||||
val CandidateV = """(\d+)\.(\d+)\.(\d+)(-RC\d+)""".r
|
||||
val NonReleaseV = """(\d+)\.(\d+)\.(\d+)(-\w+)""".r
|
||||
val NonReleaseV = """(\d+)\.(\d+)\.(\d+)([-\w+]*)""".r
|
||||
v match {
|
||||
case ReleaseV(x, y, z, ht) => Some((x.toInt, y.toInt))
|
||||
case CandidateV(x, y, z, ht) => Some((x.toInt, y.toInt))
|
||||
|
||||
Reference in New Issue
Block a user