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

Use project resolvers before dependency resolvers in coursier 

csrResolvers.all evaluates all possible scopes in arbitrary order. This change
makes sure at least the project resolvers are placed before any resolvers from
dependency projects.
This commit is contained in:
Arnout Engelen 2020-02-03 13:22:34 +01:00
parent f669fc734a
commit 88623828d4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -135,9 +135,11 @@ object CoursierRepositoriesTasks {
Def.taskDyn {
val s = state.value
val projectRef = thisProjectRef.value
val projects = Project.transitiveInterDependencies(s, projectRef)
val dependencyRefs = Project.transitiveInterDependencies(s, projectRef)
Def.task {
csrResolvers.all(ScopeFilter(inProjects(projectRef +: projects: _*))).value.flatten
val resolvers = csrResolvers.all(ScopeFilter(inProjects(projectRef))).value ++
csrResolvers.all(ScopeFilter(inProjects(dependencyRefs: _*))).value
resolvers.flatten
}
}
}