Permalink
Browse files

correct default resolver order

  • Loading branch information...
1 parent dd6120a commit 3473ba0ca0cf320cff34757fda550cc5e4c8e63a @harrah committed Dec 13, 2011
Showing with 4 additions and 4 deletions.
  1. +4 −4 main/Defaults.scala
View
@@ -671,9 +671,9 @@ object Classpaths
case (Some(delegated), Seq()) => delegated
case (_, rs) => task { Resolver.withDefaultResolvers(rs) }
},
- fullResolvers <<= (projectResolver,externalResolvers,sbtPlugin,sbtResolver) map { (pr,rs,isPlugin,sr) =>
- val base = pr +: rs
- if(isPlugin) sr +: base else base
+ fullResolvers <<= (projectResolver,externalResolvers,sbtPlugin,sbtResolver) map { (proj,rs,isPlugin,sbtr) =>
+ val base = if(isPlugin) sbtr +: rs else rs
+ proj +: base
},
offline in GlobalScope :== false,
moduleName <<= normalizedName,
@@ -1198,4 +1198,4 @@ trait BuildCommon
def getPrevious[T](task: TaskKey[T]): Initialize[Task[Option[T]]] =
(state, resolvedScoped) map { (s, ctx) => getFromContext(task, ctx, s) }
-}
+}

0 comments on commit 3473ba0

Please sign in to comment.