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

Merge pull request #367 from vigdorchik/363_validate_resolvers 

363 validate resolvers
This commit is contained in:
Mark Harrah 2012-02-12 15:07:56 -08:00
parent baaf75b08a 7cf1e3fe3c
commit 13bcdf497e
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
main/Defaults.scala
View File

@ -801,6 +801,11 @@ object Classpaths
CrossVersion(scalaVersion, binVersion)(base).copy(crossVersion = CrossVersion.Disabled) CrossVersion(scalaVersion, binVersion)(base).copy(crossVersion = CrossVersion.Disabled)
} }
) )
def warnResolversConflict(ress: Seq[Resolver], log: Logger) {
for ((name, r) <- ress groupBy (_.name) if r.size > 1) {
log.warn("Multiple resolvers configured with the name '" + name + "'. Rename to avoid conflict.")
}
}
def pluginProjectID: Initialize[ModuleID] = (sbtVersion in update, sbtBinaryVersion in update, scalaVersion in update, scalaBinaryVersion in update, projectID, sbtPlugin) { def pluginProjectID: Initialize[ModuleID] = (sbtVersion in update, sbtBinaryVersion in update, scalaVersion in update, scalaBinaryVersion in update, projectID, sbtPlugin) {
(sbtV, sbtBV, scalaV, scalaBV, pid, isPlugin) => (sbtV, sbtBV, scalaV, scalaBV, pid, isPlugin) =>
if(isPlugin) if(isPlugin)
@ -964,6 +969,7 @@ object Classpaths
(thisProjectRef, configuration, settings, buildDependencies) flatMap unmanagedDependencies0 (thisProjectRef, configuration, settings, buildDependencies) flatMap unmanagedDependencies0
def mkIvyConfiguration: Initialize[Task[IvyConfiguration]] = def mkIvyConfiguration: Initialize[Task[IvyConfiguration]] =
(fullResolvers, ivyPaths, otherResolvers, moduleConfigurations, offline, checksums in update, appConfiguration, streams) map { (rs, paths, other, moduleConfs, off, check, app, s) => (fullResolvers, ivyPaths, otherResolvers, moduleConfigurations, offline, checksums in update, appConfiguration, streams) map { (rs, paths, other, moduleConfs, off, check, app, s) =>
warnResolversConflict(rs ++: other, s.log)
new InlineIvyConfiguration(paths, rs, other, moduleConfs, off, Some(lock(app)), check, s.log) new InlineIvyConfiguration(paths, rs, other, moduleConfs, off, Some(lock(app)), check, s.log)
} }