Take into account build tool-supplied bridge JARs

Author: alexarchambault

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

@@ -23,7 +23,8 @@ final class ScalaInstance private (
     val organization: String,
     val name: String,
     override val version: String,
-    override val allJars: Array[File]
+    override val allJars: Array[File],
+    val bridgeJarsOpt: Option[Seq[File]] = None
 ) extends xsbti.compile.ScalaInstance {
 
   override lazy val loaderCompilerOnly: ClassLoader =
@@ -153,6 +154,15 @@ object ScalaInstance {
 
   private[ScalaInstance] final val ScalacCompilerName = "scala-compiler"
 
+  def apply(
+      scalaOrg: String,
+      scalaName: String,
+      scalaVersion: String,
+      allJars: Seq[AbsolutePath],
+      logger: Logger
+  ): ScalaInstance =
+    apply(scalaOrg, scalaName, scalaVersion, allJars, logger, None)
+
   /**
    * Reuses all jars to create an Scala instance if and only if all of them exist.
    *
@@ -170,7 +180,8 @@ object ScalaInstance {
       scalaName: String,
       scalaVersion: String,
       allJars: Seq[AbsolutePath],
-      logger: Logger
+      logger: Logger,
+      bridgeJarsOpt: Option[Seq[AbsolutePath]]
   ): ScalaInstance = {
     val jarsKey = allJars.map(_.underlying).sortBy(_.toString).toList
     if (allJars.nonEmpty) {
@@ -179,7 +190,13 @@ object ScalaInstance {
           DebugFilter.Compilation
         )
         jarsKey.foreach(p => logger.debug(s"  => $p")(DebugFilter.Compilation))
-        new ScalaInstance(scalaOrg, scalaName, scalaVersion, allJars.map(_.toFile).toArray)
+        new ScalaInstance(
+          scalaOrg,
+          scalaName,
+          scalaVersion,
+          allJars.map(_.toFile).toArray,
+          bridgeJarsOpt.map(_.map(_.toFile))
+        )
       }
 
       val nonExistingJars = allJars.filter(j => !Files.exists(j.underlying))

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

@@ -116,7 +116,11 @@ object BloopComponentCompiler {
      */
     private def compiledBridge(bridgeSources: ModuleID, scalaInstance: ScalaInstance): File = {
       val raw = new RawCompiler(scalaInstance, ClasspathOptionsUtil.auto, logger)
-      val zinc = new BloopComponentCompiler(raw, manager, bridgeSources, logger)
+      val bridgeJarsOpt = scalaInstance match {
+        case b: _root_.bloop.ScalaInstance => b.bridgeJarsOpt
+        case _ => None
+      }
+      val zinc = new BloopComponentCompiler(raw, manager, bridgeSources, bridgeJarsOpt, logger)
       logger.debug(s"Getting $bridgeSources for Scala ${scalaInstance.version}")(
         DebugFilter.Compilation
       )
@@ -229,6 +233,7 @@ private[inc] class BloopComponentCompiler(
     compiler: RawCompiler,
     manager: BloopComponentManager,
     bridgeSources: ModuleID,
+    bridgeJarsOpt: Option[Seq[File]],
     logger: BloopLogger
 ) {
   implicit val debugFilter: DebugFilter.Compilation.type = DebugFilter.Compilation
@@ -257,23 +262,25 @@ private[inc] class BloopComponentCompiler(
       IO.withTemporaryDirectory { _ =>
         val shouldResolveSources =
           bridgeSources.explicitArtifacts.exists(_.`type` == "src")
-        val allArtifacts = BloopDependencyResolution.resolveWithErrors(
-          List(
-            BloopDependencyResolution
-              .Artifact(bridgeSources.organization, bridgeSources.name, bridgeSources.revision)
-          ),
-          logger,
-          resolveSources = shouldResolveSources,
-          List(
-            coursierapi.MavenRepository.of(
-              "https://scala-ci.typesafe.com/artifactory/scala-integration/"
+        val allArtifacts = bridgeJarsOpt.map(_.map(_.toPath)).getOrElse {
+          BloopDependencyResolution.resolveWithErrors(
+            List(
+              BloopDependencyResolution
+                .Artifact(bridgeSources.organization, bridgeSources.name, bridgeSources.revision)
+            ),
+            logger,
+            resolveSources = shouldResolveSources,
+            List(
+              coursierapi.MavenRepository.of(
+                "https://scala-ci.typesafe.com/artifactory/scala-integration/"
+              )
             )
-          )
-        ) match {
-          case Right(paths) => paths.map(_.underlying).toVector
-          case Left(t) =>
-            val msg = s"Couldn't retrieve module $bridgeSources"
-            throw new InvalidComponent(msg, t)
+          ) match {
+            case Right(paths) => paths.map(_.underlying).toVector
+            case Left(t) =>
+              val msg = s"Couldn't retrieve module $bridgeSources"
+              throw new InvalidComponent(msg, t)
+          }
         }
 
         if (!shouldResolveSources) {
@@ -286,7 +293,7 @@ private[inc] class BloopComponentCompiler(
             if (!HydraSupport.isEnabled(compiler.scalaInstance)) (bridgeSources.name, sources)
             else {
               val hydraBridgeModule = HydraSupport.getModuleForBridgeSources(compiler.scalaInstance)
-              mergeBloopAndHydraBridges(sources, hydraBridgeModule) match {
+              mergeBloopAndHydraBridges(sources.toVector, hydraBridgeModule) match {
                 case Right(mergedHydraBridgeSourceJar) =>
                   (hydraBridgeModule.name, mergedHydraBridgeSourceJar)
                 case Left(error) =>

frontend/src/main/scala/bloop/data/Project.scala

@@ -290,7 +290,14 @@ object Project {
         else {
           val scalaJars = scala.jars.map(AbsolutePath.apply)
           Some(
-            ScalaInstance(scala.organization, scala.name, scala.version, scalaJars, logger)
+            ScalaInstance(
+              scala.organization,
+              scala.name,
+              scala.version,
+              scalaJars,
+              logger,
+              scala.bridgeJars.map(_.map(AbsolutePath(_)))
+            )
           )
         }
       }