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

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
This commit is contained in:
dmharrah 2009-08-02 01:03:45 +00:00
parent 8d507ea50e
commit 4afeeb1c8b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/scala/sbt/ManageDependencies.scala
View File

@ -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))