luke/sbt
1
0
Fork 0
mirror of https://github.com/sbt/sbt.git synced 2026-09-03 16:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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 c3abb9fad4 77aa9ea87e
commit 192c40dd91
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
util/cross/src/main/input_sources/CrossVersionUtil.scala
+1 -1
View File
@@ -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))