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

insert externalResolvers between resolvers and fullResolvers

This commit is contained in:
Mark Harrah 2011-05-14 18:21:41 -04:00
parent 3464228deb
commit c81a2f9d3c
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
main/Defaults.scala
View File

@ -539,8 +539,9 @@ object Classpaths
normalizedName <<= name(StringUtilities.normalize), normalizedName <<= name(StringUtilities.normalize),
organization <<= normalizedName.identity, organization <<= normalizedName.identity,
classpathFilter in GlobalScope :== "*.jar", classpathFilter in GlobalScope :== "*.jar",
fullResolvers <<= (projectResolver,resolvers,sbtPlugin,sbtResolver) map { (pr,rs,isPlugin,sr) => externalResolvers <<= resolvers map Resolver.withDefaultResolvers,
val base = pr +: Resolver.withDefaultResolvers(rs) fullResolvers <<= (projectResolver,externalResolvers,sbtPlugin,sbtResolver) map { (pr,rs,isPlugin,sr) =>
val base = pr +: rs
if(isPlugin) sr +: base else base if(isPlugin) sr +: base else base
}, },
offline in GlobalScope :== false, offline in GlobalScope :== false,

1
main/Keys.scala
View File

@ -216,6 +216,7 @@ object Keys
val moduleID = SettingKey[String]("module-id", "The name of the current module, used for dependency management.") 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 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 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 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 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.") val fullResolvers = TaskKey[Seq[Resolver]]("full-resolvers", "Combines the project resolver, default resolvers, and user-defined resolvers.")