luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix resolution of bridge using Coursier

This commit is contained in:
Adrien Piquerez 2024-03-06 16:40:41 +01:00
parent 323d1da16e
commit 7ca6ad5fec
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/src/main/scala/sbt/Defaults.scala
View File

@ -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)),

6
main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala
View File

@ -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