fport: CrossVersion.patch

CrossVersion.full strips off -bin-suffix.
Ref sbt/sbt#2757

Author: milessabin

librarymanagement/src/main/contraband/librarymanagement.json

@@ -144,6 +144,16 @@
           ],
           "type": "record"
         },
+        {
+          "name": "Patch",
+          "namespace": "sbt.librarymanagement",
+          "target": "Scala",
+          "doc": [
+            "Cross-versions a module by stripping off -bin-suffix.",
+            "This is intented for patch-version compatible alternative replacements."
+          ],
+          "type": "record"
+        },
         {
           "name": "Full",
           "namespace": "sbt.librarymanagement",

librarymanagement/src/main/scala/sbt/librarymanagement/CrossVersionExtra.scala

@@ -18,6 +18,19 @@ abstract class CrossVersionFunctions {
   /** Cross-versions a module with the binary version (typically the binary Scala version).  */
   def binary: CrossVersion = Binary()
 
+  /**
+   * Cross-versions a module with the full Scala version excluding any `-bin` suffix.
+   */
+  def patch: CrossVersion = Patch()
+
+  private[sbt] def patchFun(fullVersion: String): String = {
+    val BinCompatV = """(\d+)\.(\d+)\.(\d+)(-\w+)??-bin(-.*)?""".r
+    fullVersion match {
+      case BinCompatV(x, y, z, w, _) => s"""$x.$y.$z${if (w == null) "" else w}"""
+      case other                     => other
+    }
+  }
+
   private[sbt] def append(s: String): Option[String => String] = Some(x => crossName(x, s))
 
   /**
@@ -29,6 +42,7 @@ abstract class CrossVersionFunctions {
     cross match {
       case _: Disabled => None
       case _: Binary   => append(binaryVersion)
+      case _: Patch    => append(patchFun(fullVersion))
       case _: Full     => append(fullVersion)
     }
 

librarymanagement/src/test/scala/CrossVersionTest.scala

@@ -114,6 +114,24 @@ class CrossVersionTest extends UnitSpec {
   it should "return binary Scala version for 2.10.1 as 2.10" in {
     CrossVersion.binaryScalaVersion("2.10.1") shouldBe "2.10"
   }
+  it should "return patch Scala version for 2.11.8 as 2.11.8" in {
+    CrossVersion(CrossVersion.patch, "2.11.8", "dummy").map(_("artefact")) shouldBe Some("artefact_2.11.8")
+  }
+  it should "return patch Scala version for 2.11.8-M1 as 2.11.8-M1" in {
+    CrossVersion(CrossVersion.patch, "2.11.8-M1", "dummy").map(_("artefact")) shouldBe Some("artefact_2.11.8-M1")
+  }
+  it should "return patch Scala version for 2.11.8-RC1 as 2.11.8-RC1" in {
+    CrossVersion(CrossVersion.patch, "2.11.8-RC1", "dummy").map(_("artefact")) shouldBe Some("artefact_2.11.8-RC1")
+  }
+  it should "return patch Scala version for 2.11.8-bin-extra as 2.11.8" in {
+    CrossVersion(CrossVersion.patch, "2.11.8-bin-extra", "dummy").map(_("artefact")) shouldBe Some("artefact_2.11.8")
+  }
+  it should "return patch Scala version for 2.11.8-M1-bin-extra as 2.11.8-M1" in {
+    CrossVersion(CrossVersion.patch, "2.11.8-M1-bin-extra", "dummy").map(_("artefact")) shouldBe Some("artefact_2.11.8-M1")
+  }
+  it should "return patch Scala version for 2.11.8-RC1-bin-extra as 2.11.8-RC1" in {
+    CrossVersion(CrossVersion.patch, "2.11.8-RC1-bin-extra", "dummy").map(_("artefact")) shouldBe Some("artefact_2.11.8-RC1")
+  }
   it should "return disabled cross version as equal to a copy" in {
     Disabled() shouldBe Disabled()
   }