From c5954ae156d78a8c2138df0b2028d3d04338e608 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 21 Feb 2016 04:08:12 -0500 Subject: [PATCH 1/2] Fixes #2464. Actually reorganize appResolvers Fixes #2464 and Fixes #2465 appResolvers is a set of resolvers specified in the launcher configuration. This list fluctuates depending on the version of sbt, and sbt 0.13.10 meant to stabilize it by weeding out JCenter even when it includes it, which failed when I applied the filter on the wrong list. This should correct it. --- main/src/main/scala/sbt/Defaults.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 633215062..ae6e93823 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1147,10 +1147,14 @@ object Classpaths { overrideBuildResolvers <<= appConfiguration(isOverrideRepositories), externalResolvers <<= (externalResolvers.task.?, resolvers, appResolvers, useJCenter) { case (Some(delegated), Seq(), _, _) => delegated - case (_, rs, Some(ars), uj) => task { ars ++ Resolver.reorganizeAppResolvers(rs, uj, true) } - case (_, rs, _, uj) => task { Resolver.withDefaultResolvers(rs, uj) } + case (_, rs, Some(ars), uj) => task { ars ++ rs } + case (_, rs, _, uj) => task { Resolver.withDefaultResolvers(rs, uj, true) } + }, + appResolvers := { + val ac = appConfiguration.value + val uj = useJCenter.value + appRepositories(ac) map { ars => Resolver.reorganizeAppResolvers(ars, uj, true) } }, - appResolvers <<= appConfiguration apply appRepositories, bootResolvers <<= appConfiguration map bootRepositories, fullResolvers <<= (projectResolver, externalResolvers, sbtPlugin, sbtResolver, bootResolvers, overrideBuildResolvers) map { (proj, rs, isPlugin, sbtr, boot, overrideFlag) => boot match { From d2cb16968cb5cc8fe2c1b81ae40c9425ef928602 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 21 Feb 2016 06:44:35 -0500 Subject: [PATCH 2/2] Adds test for #2466 per review --- .../sbt-test/dependency-management/default-resolvers/test | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sbt/src/sbt-test/dependency-management/default-resolvers/test b/sbt/src/sbt-test/dependency-management/default-resolvers/test index 2513e8edf..0d310c9f5 100644 --- a/sbt/src/sbt-test/dependency-management/default-resolvers/test +++ b/sbt/src/sbt-test/dependency-management/default-resolvers/test @@ -3,3 +3,9 @@ > set useJCenter := true > check2 + +> reload + +> set resolvers += Resolver.jcenterRepo + +> check2