From 4afeeb1c8b3155724fb9c18eebf37c5372bfa914 Mon Sep 17 00:00:00 2001 From: dmharrah Date: Sun, 2 Aug 2009 01:03:45 +0000 Subject: [PATCH] Change order of repositories: local,shared,Maven central,user defined, and finally, scala-tools git-svn-id: https://simple-build-tool.googlecode.com/svn/trunk@929 d89573ee-9141-11dd-94d4-bdf5e562f29c --- src/main/scala/sbt/ManageDependencies.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/scala/sbt/ManageDependencies.scala b/src/main/scala/sbt/ManageDependencies.scala index a0703dc4b..d5fee4473 100644 --- a/src/main/scala/sbt/ManageDependencies.scala +++ b/src/main/scala/sbt/ManageDependencies.scala @@ -201,7 +201,7 @@ object ManageDependencies { log.debug("Using inline repositories.") configureDefaults() - val extra = if(flags.addScalaTools) ScalaToolsReleases :: resolvers.toList else resolvers + val extra = if(flags.addScalaTools) resolvers ++ List(ScalaToolsReleases) else resolvers // user resolvers come before scala-tools addResolvers(ivy.getSettings, extra, log) } if(autodetect) @@ -528,12 +528,12 @@ object ManageDependencies moduleID.check() } /** Sets the resolvers for 'settings' to 'resolvers'. This is done by creating a new chain and making it the default. */ - private def addResolvers(settings: IvySettings, resolvers: Iterable[Resolver], log: Logger) + private def addResolvers(settings: IvySettings, resolvers: Seq[Resolver], log: Logger) { val newDefault = new ChainResolver newDefault.setName("redefined-public") + newDefault.add(settings.getDefaultResolver) // put local, shared, and public(Maven Central) repositories before user repositories resolvers.foreach(r => newDefault.add(ConvertResolver(r))) - newDefault.add(settings.getDefaultResolver) settings.addResolver(newDefault) settings.setDefaultResolver(newDefault.getName) if(log.atLevel(Level.Debug))