From 88623828d49a7d57827499b7ae8d6797617649bb Mon Sep 17 00:00:00 2001 From: Arnout Engelen Date: Mon, 3 Feb 2020 13:22:34 +0100 Subject: [PATCH] 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. --- .../scala/sbt/coursierint/CoursierRepositoriesTasks.scala | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala b/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala index 749ca9525..4d7e2cbb3 100644 --- a/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala +++ b/main/src/main/scala/sbt/coursierint/CoursierRepositoriesTasks.scala @@ -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 } } }