Merge pull request #2712 from tgodzik/bridge-impr

improvement: Make sure onl sbt bridge is used for bridge artifacts

Author: tgodzik

backend/src/main/scala/bloop/ScalaInstance.scala

@@ -181,7 +181,8 @@ object ScalaInstance {
       scalaVersion: String,
       allJars: Seq[AbsolutePath],
       logger: Logger,
-      bridgeJarsOpt: Option[Seq[AbsolutePath]]
+      bridgeJarsOpt: Option[Seq[AbsolutePath]],
+      additionalRepositories: List[Repository] = Nil
   ): ScalaInstance = {
     val jarsKey = allJars.map(_.underlying).sortBy(_.toString).toList
     if (allJars.nonEmpty) {
@@ -202,7 +203,7 @@ object ScalaInstance {
       val nonExistingJars = allJars.filter(j => !Files.exists(j.underlying))
       nonExistingJars.foreach(p => logger.error(s"Scala instance jar ${p.syntax} doesn't exist!"))
       instancesByJar.computeIfAbsent(jarsKey, _ => newInstance)
-    } else resolve(scalaOrg, scalaName, scalaVersion, logger)
+    } else resolve(scalaOrg, scalaName, scalaVersion, logger, additionalRepositories)
   }
 
   // Cannot wait to use opaque types for this

backend/src/main/scala/sbt/internal/inc/BloopComponentCompiler.scala

@@ -279,7 +279,9 @@ private[inc] class BloopComponentCompiler(
             List(
               coursierapi.MavenRepository.of(
                 "https://scala-ci.typesafe.com/artifactory/scala-integration/"
-              )
+              ),
+              coursierapi.MavenRepository
+                .of("https://repo.scala-lang.org/artifactory/maven-nightlies")
             )
           ) match {
             case Right(paths) => paths.map(_.underlying).toVector
@@ -288,10 +290,12 @@ private[inc] class BloopComponentCompiler(
               throw new InvalidComponent(msg, t)
           }
         }
-
         if (!shouldResolveSources) {
-          // This is usually true in the Dotty case, that has a pre-compiled compiler
-          manager.define(compilerBridgeId, allArtifacts.map(_.toFile()))
+          // This is usually true in the Dotty case, that has a pre-compiled compiler, only take the bridge jar
+          manager.define(
+            compilerBridgeId,
+            allArtifacts.find(_.toString().contains(bridgeSources.name)).toList.map(_.toFile())
+          )
         } else {
           val (sources, xsbtiJars) =
             allArtifacts.partition(_.toFile.getName.endsWith("-sources.jar"))

frontend/src/test/scala/bloop/BaseCompileSpec.scala

@@ -70,6 +70,15 @@ abstract class BaseCompileSpec extends bloop.testing.BaseSuite {
     }
   }
 
+  checkCompiles(
+    "scala3-nightly",
+    ExitStatus.Ok,
+    "3.8.0-RC1-bin-20250825-25092c7-NIGHTLY",
+    """|class Foo:
+       |  def foo: Int = 1
+       |""".stripMargin
+  )
+
   // https://github.com/scala/scala3/issues/22026
   checkCompiles(
     "scala3-i22026",

frontend/src/test/scala/bloop/util/TestProject.scala

@@ -21,6 +21,7 @@ import bloop.io.RelativePath
 import bloop.logging.Logger
 import bloop.logging.NoopLogger
 import bloop.util.TestUtil.ProjectArchetype
+import coursierapi.MavenRepository
 
 final case class TestProject(
     config: Config.Project,
@@ -217,10 +218,26 @@ abstract class BaseTestProject {
       scalaVersion: Option[String],
       allJars: Seq[AbsolutePath],
       logger: Logger
-  ): ScalaInstance =
+  ): ScalaInstance = {
+    val additionalRepositories = if (scalaVersion.exists(_.contains("NIGHTLY"))) {
+      List(MavenRepository.of("https://repo.scala-lang.org/artifactory/maven-nightlies"))
+    } else {
+      Nil
+    }
     scalaVersion
-      .map(v => ScalaInstance.apply(scalaOrg, scalaName, v, allJars, logger))
+      .map(v =>
+        ScalaInstance.apply(
+          scalaOrg,
+          scalaName,
+          v,
+          allJars,
+          logger,
+          None,
+          additionalRepositories
+        )
+      )
       .getOrElse(TestUtil.scalaInstance)
+  }
 
   def populateWorkspaceInConfigDir(
       configDir: AbsolutePath,