From f98ee86668d7065ffb49d541e81e303558cd6229 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Fri, 9 Jun 2017 11:49:12 +0100 Subject: [PATCH] Clarify NonRelease variants in CrossVersion --- .../librarymanagement/cross/CrossVersionUtil.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala index 8c3bdaec0..e2b9999fb 100644 --- a/librarymanagement/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala +++ b/librarymanagement/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala @@ -24,8 +24,8 @@ object CrossVersionUtil { private val ReleaseV = raw"""$basicVersion(-\d+)?""".r private val BinCompatV = raw"""$basicVersion-bin(-.*)?""".r private val CandidateV = raw"""$basicVersion(-RC\d+)""".r - private val NonReleaseV_1 = raw"""$basicVersion([-\w+]*)""".r - private val NonReleaseV_2 = raw"""$basicVersion(-\w+)""".r + private val NonReleaseV_n = raw"""$basicVersion([-\w]*)""".r // 0-n word suffixes, with leading dashes + private val NonReleaseV_1 = raw"""$basicVersion(-\w+)""".r // 1 word suffix, after a dash private[sbt] val PartialVersion = raw"""($intPattern)\.($intPattern)(?:\..+)?""".r private[sbt] def isSbtApiCompatible(v: String): Boolean = sbtApiVersion(v).isDefined @@ -38,7 +38,7 @@ object CrossVersionUtil { private[sbt] def sbtApiVersion(v: String): Option[(Int, Int)] = v match { case ReleaseV(x, y, _, _) => Some((x.toInt, y.toInt)) case CandidateV(x, y, _, _) => Some((x.toInt, y.toInt)) - case NonReleaseV_1(x, y, z, _) if z.toInt > 0 => Some((x.toInt, y.toInt)) + case NonReleaseV_n(x, y, z, _) if z.toInt > 0 => Some((x.toInt, y.toInt)) case _ => None } @@ -51,7 +51,7 @@ object CrossVersionUtil { private[sbt] def scalaApiVersion(v: String): Option[(Int, Int)] = v match { case ReleaseV(x, y, _, _) => Some((x.toInt, y.toInt)) case BinCompatV(x, y, _, _) => Some((x.toInt, y.toInt)) - case NonReleaseV_2(x, y, z, _) if z.toInt > 0 => Some((x.toInt, y.toInt)) + case NonReleaseV_1(x, y, z, _) if z.toInt > 0 => Some((x.toInt, y.toInt)) case _ => None }