From 7ca6ad5feca30d730b0f79f1b8ad4e2a39bccb29 Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Wed, 6 Mar 2024 16:40:41 +0100
Subject: [PATCH] Fix resolution of bridge using Coursier

---
 main/src/main/scala/sbt/Defaults.scala                      | 5 +++--
 .../scala/sbt/coursierint/CoursierRepositoriesTasks.scala   | 6 ++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 4594b2c62..28a3b0a30 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -3507,7 +3507,7 @@ object Classpaths {
     ) ++ Seq(
       csrProject := CoursierInputsTasks.coursierProjectTask.value,
       csrConfiguration := LMCoursier.coursierConfigurationTask.value,
-      csrResolvers := CoursierRepositoriesTasks.coursierResolversTask.value,
+      csrResolvers := CoursierRepositoriesTasks.coursierResolversTask(fullResolvers).value,
       csrRecursiveResolvers := CoursierRepositoriesTasks.coursierRecursiveResolversTask.value,
       csrSbtResolvers := CoursierRepositoriesTasks.coursierSbtResolversTask.value,
       csrInterProjectDependencies := CoursierInputsTasks.coursierInterProjectDependenciesTask.value,
@@ -3744,7 +3744,8 @@ object Classpaths {
         Seq(
           dependencyResolution := dependencyResolutionTask.value,
           csrConfiguration := LMCoursier.scalaCompilerBridgeConfigurationTask.value,
-          csrResolvers := CoursierRepositoriesTasks.coursierResolversTask.value,
+          csrResolvers :=
+            CoursierRepositoriesTasks.coursierResolversTask(scalaCompilerBridgeResolvers).value,
           externalResolvers := scalaCompilerBridgeResolvers.value,
           ivyConfiguration := InlineIvyConfiguration(
             lock = Option(lock(appConfiguration.value)),
diff --git a/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
index fbf8043da..359cc0b80 100644
--- a/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
+++ b/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
@@ -56,8 +56,10 @@ object CoursierRepositoriesTasks {
   // https://github.com/sbt/sbt/issues/4661
   private final val keepPreloaded = false // coursierKeepPreloaded.value
 
-  def coursierResolversTask: Def.Initialize[sbt.Task[Seq[Resolver]]] = Def.task {
-    val result0 = fullResolvers.value.filterNot(_ == projectResolver.value)
+  def coursierResolversTask(
+      resolversKey: TaskKey[Seq[Resolver]]
+  ): Def.Initialize[sbt.Task[Seq[Resolver]]] = Def.task {
+    val result0 = resolversKey.value.filterNot(_ == projectResolver.value)
     val reorderResolvers = true // coursierReorderResolvers.value
 
     val paths = ivyPaths.value