Explicitly pass the scala3-sbt-bridge artifact to Bloop

Author: Gedochao

modules/build/src/main/scala/scala/build/Build.scala

@@ -906,7 +906,8 @@ object Build {
           scalaVersion = params.scalaVersion,
           scalaBinaryVersion = params.scalaBinaryVersion,
           scalacOptions = scalacOptions.toSeq.map(_.value),
-          compilerClassPath = scalaArtifacts.compilerClassPath
+          compilerClassPath = scalaArtifacts.compilerClassPath,
+          bridgeJarsOpt = scalaArtifacts.bridgeJarsOpt
         )
         Some(compilerParams)
 

modules/build/src/main/scala/scala/build/Project.scala

@@ -48,7 +48,8 @@ final case class Project(
     val scalaConfigOpt = scalaCompiler.map { scalaCompiler0 =>
       bloopScalaConfig("org.scala-lang", "scala-compiler", scalaCompiler0.scalaVersion).copy(
         options = updateScalacOptions(scalaCompiler0.scalacOptions).map(_.value),
-        jars = scalaCompiler0.compilerClassPath.map(_.toNIO).toList
+        jars = scalaCompiler0.compilerClassPath.map(_.toNIO).toList,
+        bridgeJars = scalaCompiler0.bridgeJarsOpt.map(_.map(_.toNIO).toList)
       )
     }
     baseBloopProject(
@@ -229,6 +230,7 @@ object Project {
       options = Nil,
       jars = Nil,
       analysis = None,
-      setup = None
+      setup = None,
+      bridgeJars = None
     )
 }

modules/build/src/main/scala/scala/build/ScalaCompilerParams.scala

@@ -4,5 +4,6 @@ final case class ScalaCompilerParams(
   scalaVersion: String,
   scalaBinaryVersion: String,
   scalacOptions: Seq[String],
-  compilerClassPath: Seq[os.Path]
+  compilerClassPath: Seq[os.Path],
+  bridgeJarsOpt: Option[Seq[os.Path]]
 )

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

@@ -607,15 +607,19 @@ class SipScalaTests extends ScalaCliSuite with SbtTestHelper with MillTestHelper
         .fromRoot { root =>
           val localRepoPath = root / "local-repo"
           val sv            = "3.4.1-RC1"
-          val csRes = os.proc(
-            TestUtil.cs,
-            "fetch",
-            "--cache",
-            localRepoPath,
-            s"org.scala-lang:scala3-compiler_3:$sv"
-          )
-            .call(cwd = root)
-          expect(csRes.exitCode == 0)
+          val artifactNames =
+            Seq("scala3-compiler_3", "scala3-sbt-bridge")
+          for { artifactName <- artifactNames } {
+            val csRes = os.proc(
+              TestUtil.cs,
+              "fetch",
+              "--cache",
+              localRepoPath,
+              s"org.scala-lang:$artifactName:$sv"
+            )
+              .call(cwd = root)
+            expect(csRes.exitCode == 0)
+          }
           val buildServerOptions =
             if (withBloop) Nil else Seq("--server=false")
           val r = os.proc(

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

@@ -176,6 +176,22 @@ object Artifacts {
           ).left.flatMap(_.maybeRecoverWithDefault(Seq.empty, maybeRecoverOnError))
         }
 
+        val bridgeJarsOpt = Option.when(scalaArtifactsParams.params.scalaVersion.startsWith("3.")) {
+          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)
+        }
+
         def fetchedArtifactToPath(fetched: Fetch.Result): Seq[os.Path] =
           fetched.fullDetailedArtifacts.collect { case (_, _, _, Some(f)) => os.Path(f, Os.pwd) }
 
@@ -273,7 +289,8 @@ object Artifacts {
           scalaNativeCli,
           internalDependencies,
           scalapyDependencies,
-          scalaArtifactsParams.params
+          scalaArtifactsParams.params,
+          bridgeJarsOpt
         )
         Some(scala)
 

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

@@ -10,7 +10,8 @@ final case class ScalaArtifacts(
   scalaNativeCli: Seq[os.Path],
   internalDependencies: Seq[AnyDependency],
   extraDependencies: Seq[AnyDependency],
-  params: ScalaParameters
+  params: ScalaParameters,
+  bridgeJarsOpt: Option[Seq[os.Path]]
 ) {
 
   lazy val compilerClassPath: Seq[os.Path] =