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

Merge pull request #1573 from cunei/wip-scala-bin-compat 

Allow the "-bin" Scala version suffix to specify a bincompat version
This commit is contained in:
Josh Suereth 2014-09-05 11:34:05 -04:00
parent 86480a3f6c a6d85ae2cb
commit b43d358e0e
1 changed files with 2 additions and 0 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

@ -39,9 +39,11 @@ object CrossVersionUtil
private[${{cross.package0}}] def scalaApiVersion(v: String): Option[(Int, Int)] = private[${{cross.package0}}] def scalaApiVersion(v: String): Option[(Int, Int)] =
{ {
val ReleaseV = """(\d+)\.(\d+)\.(\d+)(-\d+)?""".r val ReleaseV = """(\d+)\.(\d+)\.(\d+)(-\d+)?""".r
val BinCompatV = """(\d+)\.(\d+)\.(\d+)-bin(-.*)?""".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 BinCompatV(x, y, z, ht) => Some((x.toInt, y.toInt))
case NonReleaseV(x, y, z, ht) if z.toInt > 0 => Some((x.toInt, y.toInt)) case NonReleaseV(x, y, z, ht) if z.toInt > 0 => Some((x.toInt, y.toInt))
case _ => None case _ => None
} }