Merge pull request #2927 from Gedochao/maintenance/scala2-sbt-bridge-for-bloop

Pass scala2-sbt-bridge to Bloop explicitly for Scala 2.13.12+

Author: Gedochao

modules/integration/src/test/scala/scala/cli/integration/RunTestDefinitions.scala

@@ -2021,6 +2021,17 @@ abstract class RunTestDefinitions
         .call(cwd = root, env = extraEnv)
       os.proc(TestUtil.cs, "install", s"scalac:$actualScalaVersion")
         .call(cwd = root, env = extraEnv)
+      (if (actualScalaVersion.startsWith("3")) Some("scala3-sbt-bridge")
+       else if (
+         actualScalaVersion.startsWith("2.13.") &&
+         actualScalaVersion.coursierVersion >= "2.13.12".coursierVersion
+       )
+         Some("scala2-sbt-bridge")
+       else None)
+        .foreach { bridgeArtifactName =>
+          os.proc(TestUtil.cs, "fetch", s"org.scala-lang:$bridgeArtifactName:$actualScalaVersion")
+            .call(cwd = root, env = extraEnv)
+        }
 
       // Download JVM that won't suit Bloop, also no Bloop artifacts are present
       os.proc(TestUtil.cs, "java-home", "--jvm", "zulu:11")

modules/integration/src/test/scala/scala/cli/integration/SipScalaTests.scala

@@ -597,9 +597,9 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
   for {
     withBloop <- Seq(true, false)
     withBloopString = if (withBloop) "with Bloop" else "with --server=false"
-  }
+  } {
     test(
-      s"default Scala version coming straight from a predefined local repository $withBloopString"
+      s"default Scala version (3.4.1-RC1) coming straight from a predefined local repository $withBloopString"
     ) {
       TestInputs(
         os.rel / "simple.sc" -> "println(dotty.tools.dotc.config.Properties.simpleVersionString)"
@@ -641,6 +641,53 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
         }
     }
 
+    test(
+      s"default Scala version (2.13.15-bin-ccdcde3) coming straight from a predefined local repository $withBloopString"
+    ) {
+      TestInputs(
+        os.rel / "simple.sc" -> "println(scala.util.Properties.versionNumberString)"
+      )
+        .fromRoot { root =>
+          val localRepoPath = root / "local-repo"
+          val sv            = "2.13.15-bin-ccdcde3"
+          val artifactNames =
+            Seq("scala-compiler") ++ (if (withBloop) Seq("scala2-sbt-bridge") else Nil)
+          for { artifactName <- artifactNames } {
+            val csRes = os.proc(
+              TestUtil.cs,
+              "fetch",
+              "--cache",
+              localRepoPath,
+              "-r",
+              "https://scala-ci.typesafe.com/artifactory/scala-integration",
+              s"org.scala-lang:$artifactName:$sv"
+            )
+              .call(cwd = root)
+            expect(csRes.exitCode == 0)
+          }
+          val buildServerOptions = if (withBloop) Nil else Seq("--server=false")
+          os.proc(TestUtil.cli, "bloop", "exit", "--power").call(cwd = root)
+          val r = os.proc(
+            TestUtil.cli,
+            "--cli-default-scala-version",
+            sv,
+            "--predefined-repository",
+            (localRepoPath / "https" / "repo1.maven.org" / "maven2").toNIO.toUri.toASCIIString,
+            "--predefined-repository",
+            (localRepoPath / "https" / "scala-ci.typesafe.com" / "artifactory" / "scala-integration").toNIO.toUri.toASCIIString,
+            "run",
+            "simple.sc",
+            "--with-compiler",
+            "--offline",
+            "--power",
+            buildServerOptions
+          )
+            .call(cwd = root)
+          expect(r.out.trim() == sv)
+        }
+    }
+  }
+
   test(s"default Scala version override launcher option is respected by the SBT export") {
     val input     = "printVersion.sc"
     val code      = """println(s"Default version: ${scala.util.Properties.versionNumberString}")"""

modules/options/src/main/scala/scala/build/Artifacts.scala

@@ -177,23 +177,33 @@ object Artifacts {
           ).left.flatMap(_.maybeRecoverWithDefault(Seq.empty, maybeRecoverOnError))
         }
 
-        val bridgeJarsOpt = Option.when(
-          scalaArtifactsParams.params.scalaVersion.startsWith("3.") && includeBuildServerDeps
-        ) {
-          Seq(dep"org.scala-lang:scala3-sbt-bridge:${scalaArtifactsParams.params.scalaVersion}")
-        }.map { bridgeDependencies =>
-          value {
-            artifacts(
-              bridgeDependencies.map(Positioned.none),
-              allExtraRepositories,
-              Some(scalaArtifactsParams.params),
-              logger,
-              cache.withMessage(
-                s"Downloading Scala ${scalaArtifactsParams.params.scalaVersion} bridge"
-              )
-            ).left.flatMap(_.maybeRecoverWithDefault(Seq.empty, maybeRecoverOnError))
-          }.map(_._2)
-        }
+        val bridgeJarsOpt =
+          (scalaArtifactsParams.params.scalaVersion -> includeBuildServerDeps match {
+            case (sv, true) if sv.startsWith("3.") =>
+              Some(Seq(
+                dep"org.scala-lang:scala3-sbt-bridge:${scalaArtifactsParams.params.scalaVersion}"
+              ))
+            case (sv, true)
+                if Version(sv) >= Version("2.13.12") ||
+                sv.startsWith(Constants.defaultScala213Version) =>
+              Some(Seq(
+                dep"org.scala-lang:scala2-sbt-bridge:${scalaArtifactsParams.params.scalaVersion}"
+              ))
+            case _ => None
+          })
+            .map { bridgeDependencies =>
+              value {
+                artifacts(
+                  bridgeDependencies.map(Positioned.none),
+                  allExtraRepositories,
+                  Some(scalaArtifactsParams.params),
+                  logger,
+                  cache.withMessage(
+                    s"Downloading Scala ${scalaArtifactsParams.params.scalaVersion} bridge"
+                  )
+                ).left.flatMap(_.maybeRecoverWithDefault(Seq.empty, maybeRecoverOnError))
+              }.map(_._2)
+            }
 
         def fetchedArtifactToPath(fetched: Fetch.Result): Seq[os.Path] =
           fetched.fullDetailedArtifacts.collect { case (_, _, _, Some(f)) => os.Path(f, Os.pwd) }

modules/options/src/main/scala/scala/build/options/BuildOptions.scala

@@ -461,7 +461,7 @@ final case class BuildOptions(
       addJmhDependencies = jmhOptions.addJmhDependencies,
       extraRepositories = value(finalRepositories),
       keepResolution = internal.keepResolution,
-      includeBuildServerDeps = useBuildServer.getOrElse(false),
+      includeBuildServerDeps = useBuildServer.getOrElse(true),
       cache = finalCache,
       logger = logger,
       maybeRecoverOnError = maybeRecoverOnError