From b1b7430d9ca77dbe5fa65e4b3e9cc83d765776f2 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sun, 21 Feb 2016 04:08:12 -0500 Subject: [PATCH] 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 519467705..c29c31ad7 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -1177,10 +1177,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 {