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

includePluginResolvers should work for coursier resolutions

This commit is contained in:
Brice Jaglin 2022-03-23 12:25:35 +01:00
parent 2338bea9db
commit fb479efdf9
2 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,16 +57,7 @@ object CoursierRepositoriesTasks {
private final val keepPreloaded = false // coursierKeepPreloaded.value private final val keepPreloaded = false // coursierKeepPreloaded.value
def coursierResolversTask: Def.Initialize[sbt.Task[Seq[Resolver]]] = Def.task { def coursierResolversTask: Def.Initialize[sbt.Task[Seq[Resolver]]] = Def.task {
val bootResOpt = bootResolvers.value val result0 = fullResolvers.value.filterNot(_ == projectResolver.value)
val overrideFlag = overrideBuildResolvers.value
val result0 = bootResOpt.filter(_ => overrideFlag) match {
case Some(r) => r
case None =>
val extRes = externalResolvers.value
val isSbtPlugin = sbtPlugin.value
if (isSbtPlugin) sbtResolvers.value ++ extRes
else extRes
}
val reorderResolvers = true // coursierReorderResolvers.value val reorderResolvers = true // coursierReorderResolvers.value
val paths = ivyPaths.value val paths = ivyPaths.value

7
sbt-app/src/sbt-test/dependency-management/resolvers-plugin/build.sbt
View File

@ -2,6 +2,9 @@ lazy val check = taskKey[Unit]("")
ThisBuild / includePluginResolvers := true ThisBuild / includePluginResolvers := true
check := { check := {
val rs = fullResolvers.value val ivy = fullResolvers.value
assert(rs exists (_.name == "bintray-eed3si9n-sbt-plugins"), s"$rs does not include bintray") assert(ivy exists (_.name == "bintray-eed3si9n-sbt-plugins"), s"$ivy does not include bintray")
val cs = csrResolvers.value
assert(cs exists (_.name == "bintray-eed3si9n-sbt-plugins"), s"$cs does not include bintray")
} }