From 080ce8f00ec09f4ddcca3e72da099065d91ace7c Mon Sep 17 00:00:00 2001
From: eugene yokota <eed3si9n@gmail.com>
Date: Sat, 31 Jan 2026 23:29:50 -0500
Subject: [PATCH] [2.x] Extend 2.x universe to BinCompatV (#8667)

**Problem**
Some scripted tests are failing due to the fact that -bin-SNAPSHOT
isn't being recognized.

**Solution**
This fixes sbtApiVersion to recognize BinCompatV.
---
 .../internal/librarymanagement/cross/CrossVersionUtil.scala  | 5 +++--
 .../test/scala/sbt/librarymanagement/CrossVersionTest.scala  | 3 +++
 server-test/src/test/scala/testpkg/BuildServerTest.scala     | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lm-core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala b/lm-core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala
index c693dcd28..2726c9273 100644
--- a/lm-core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala
+++ b/lm-core/src/main/scala/sbt/internal/librarymanagement/cross/CrossVersionUtil.scala
@@ -42,8 +42,9 @@ object CrossVersionUtil {
    * Compatible versions include 0.12.0-1 and 0.12.0-RC1 for Some(0, 12).
    */
   private[sbt] def sbtApiVersion(v: String): Option[(Long, Long)] = v match {
-    case ReleaseV(x, y, _, _)   => Some(sbtApiVersion(x.toLong, y.toLong))
-    case CandidateV(x, y, _, _) => Some(sbtApiVersion(x.toLong, y.toLong))
+    case ReleaseV(x, y, _, _)      => Some(sbtApiVersion(x.toLong, y.toLong))
+    case CandidateV(x, y, _, _)    => Some(sbtApiVersion(x.toLong, y.toLong))
+    case BinCompatV(x, y, _, _, _) => Some(sbtApiVersion(x.toLong, y.toLong))
     case NonReleaseV_n(x, y, z, _) if x.toLong == 0 && z.toLong > 0 =>
       Some(sbtApiVersion(x.toLong, y.toLong))
     case NonReleaseV_n(x, y, z, _) if x.toLong > 0 && (y.toLong > 0 || z.toLong > 0) =>
diff --git a/lm-core/src/test/scala/sbt/librarymanagement/CrossVersionTest.scala b/lm-core/src/test/scala/sbt/librarymanagement/CrossVersionTest.scala
index a310022ee..c0ccf4a63 100644
--- a/lm-core/src/test/scala/sbt/librarymanagement/CrossVersionTest.scala
+++ b/lm-core/src/test/scala/sbt/librarymanagement/CrossVersionTest.scala
@@ -111,6 +111,9 @@ class CrossVersionTest extends UnitSpec {
   it should "for 2.0.0-RC1 return 2" in {
     binarySbtVersion("2.0.0-RC1") shouldBe "2"
   }
+  it should "for 2.0.0-RC9-bin-SNAPSHOT return 2" in {
+    binarySbtVersion("2.0.0-RC9-bin-SNAPSHOT") shouldBe "2"
+  }
   it should "for 2 return 2" in {
     binarySbtVersion("2") shouldBe "2"
   }
diff --git a/server-test/src/test/scala/testpkg/BuildServerTest.scala b/server-test/src/test/scala/testpkg/BuildServerTest.scala
index 591f0e8d1..7466bf68b 100644
--- a/server-test/src/test/scala/testpkg/BuildServerTest.scala
+++ b/server-test/src/test/scala/testpkg/BuildServerTest.scala
@@ -101,7 +101,7 @@ class BuildServerTest extends AbstractServerTest {
       "project/A.scala",
       "project/src/main/java",
       "project/src/main/scala-3",
-      s"project/src/main/scala-sbt-${TestProperties.version}",
+      "project/src/main/scala-sbt-2",
       "project/src/main/scala/",
       s"target/out/jvm/scala-${TestProperties.scalaVersion}/buildserver-build/src_managed/main"
     ).map(rel => new File(svr.baseDirectory.getAbsoluteFile, rel).toURI).sorted