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

Merge pull request #1433 from henrikengstrom/wip/h3nk3-regex-fix 

Regex now handles versions that contain multiple '-' characters in the v...
This commit is contained in:
Josh Suereth 2014-07-07 15:49:06 -04:00
parent fd32070aab 92dd3dbd3f
commit e1c2c435d1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/cross/src/main/input_sources/CrossVersionUtil.scala
View File

@ -24,7 +24,7 @@ object CrossVersionUtil
{ {
val ReleaseV = """(\d+)\.(\d+)\.(\d+)(-\d+)?""".r val ReleaseV = """(\d+)\.(\d+)\.(\d+)(-\d+)?""".r
val CandidateV = """(\d+)\.(\d+)\.(\d+)(-RC\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 { v match {
case ReleaseV(x, y, z, ht) => Some((x.toInt, y.toInt)) case ReleaseV(x, y, z, ht) => Some((x.toInt, y.toInt))
case CandidateV(x, y, z, ht) => Some((x.toInt, y.toInt)) case CandidateV(x, y, z, ht) => Some((x.toInt, y.toInt))