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

Actually pass in the artifact, rather than just a global match

This commit is contained in:
Thomas Lockney 2012-07-15 21:03:19 -07:00 committed by Mark Harrah
parent 59c025a767
commit 8045731500
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ivy/Ivy.scala
View File

@ -335,7 +335,7 @@ private object IvySbt
case _ => m
}
}
private def toIvyArtifact(moduleID: ModuleDescriptor, a: Artifact, configurations: Iterable[String]): MDArtifact =
{
val artifact = new MDArtifact(moduleID, a.name, a.`type`, a.extension, null, extra(a, false))
@ -447,7 +447,7 @@ private object IvySbt
{
for(conf <- dependencyDescriptor.getModuleConfigurations)
{
dependencyDescriptor.addExcludeRule(conf, IvyScala.excludeRule(excls.organization, excls.name, excls.configurations, "*"))
dependencyDescriptor.addExcludeRule(conf, IvyScala.excludeRule(excls.organization, excls.name, excls.configurations, excls.artifact))
}
}
moduleID.addDependency(dependencyDescriptor)
@ -462,7 +462,7 @@ private object IvySbt
moduleID.addDependencyDescriptorMediator(overrideID, matcher, overrideWith)
}
/** It is necessary to explicitly modify direct dependencies because Ivy gives
* "IllegalStateException: impossible to get artifacts when data has not been loaded."
* "IllegalStateException: impossible to get artifacts when data has not been loaded."
* when a direct dependency is overridden with a newer version."*/
def overrideDirect(dependencies: Seq[ModuleID], overrides: Set[ModuleID]): Seq[ModuleID] =
{