From c81a2f9d3c09e0577ee2a9fee8e314a5f98cf56e Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 14 May 2011 18:21:41 -0400 Subject: [PATCH] insert externalResolvers between resolvers and fullResolvers --- main/Defaults.scala | 5 +++-- main/Keys.scala | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index 84ab68803..0202aad8a 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -539,8 +539,9 @@ object Classpaths normalizedName <<= name(StringUtilities.normalize), organization <<= normalizedName.identity, classpathFilter in GlobalScope :== "*.jar", - fullResolvers <<= (projectResolver,resolvers,sbtPlugin,sbtResolver) map { (pr,rs,isPlugin,sr) => - val base = pr +: Resolver.withDefaultResolvers(rs) + externalResolvers <<= resolvers map Resolver.withDefaultResolvers, + fullResolvers <<= (projectResolver,externalResolvers,sbtPlugin,sbtResolver) map { (pr,rs,isPlugin,sr) => + val base = pr +: rs if(isPlugin) sr +: base else base }, offline in GlobalScope :== false, diff --git a/main/Keys.scala b/main/Keys.scala index d7ec3142a..da02ee977 100644 --- a/main/Keys.scala +++ b/main/Keys.scala @@ -216,6 +216,7 @@ object Keys val moduleID = SettingKey[String]("module-id", "The name of the current module, used for dependency management.") val version = SettingKey[String]("version", "The version/revision of the current module.") val projectID = SettingKey[ModuleID]("project-id", "The dependency management descriptor for the current module.") + val externalResolvers = TaskKey[Seq[Resolver]]("external-resolvers", "The external resolvers for automatically managed dependencies.") val resolvers = SettingKey[Seq[Resolver]]("resolvers", "The user-defined additional resolvers for automatically managed dependencies.") val projectResolver = TaskKey[Resolver]("project-resolver", "Resolver that handles inter-project dependencies.") val fullResolvers = TaskKey[Seq[Resolver]]("full-resolvers", "Combines the project resolver, default resolvers, and user-defined resolvers.")