From 92dd3dbd3f33985471dc2364be85b8b5a949a9ab Mon Sep 17 00:00:00 2001 From: Henrik Engstrom Date: Thu, 3 Jul 2014 18:57:48 -0400 Subject: [PATCH] Regex now handles versions that contain multiple '-' characters in the version. --- util/cross/src/main/input_sources/CrossVersionUtil.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/util/cross/src/main/input_sources/CrossVersionUtil.scala b/util/cross/src/main/input_sources/CrossVersionUtil.scala index d192a2f8b..24310b39c 100644 --- a/util/cross/src/main/input_sources/CrossVersionUtil.scala +++ b/util/cross/src/main/input_sources/CrossVersionUtil.scala @@ -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))