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

Merge pull request #5413 from raboof/coursierResolverOrder 

Use project resolvers before dependency resolvers in coursier
This commit is contained in:
eugene yokota 2020-02-03 13:45:26 -05:00 committed by GitHub
parent f669fc734a 88623828d4
commit ef68d16148
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 { Def.taskDyn {
val s = state.value val s = state.value
val projectRef = thisProjectRef.value val projectRef = thisProjectRef.value
val projects = Project.transitiveInterDependencies(s, projectRef) val dependencyRefs = Project.transitiveInterDependencies(s, projectRef)
Def.task { 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
} }
} }
} }