From 426acdf3f962423b288d4bde5a0a5aae5bbdd8ae Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 12 Dec 2011 19:24:58 -0500 Subject: [PATCH] correct default resolver order --- main/Defaults.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index 92b3d74a1..eae8be980 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -702,9 +702,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,