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

Add include rules to ModuleID

This commit is contained in:
Dan Sanduleac 2013-11-29 09:33:21 +00:00
parent 565acc4e2a
commit 83fbb212d9
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
librarymanagement/src/main/scala/sbt/internal/librarymanagement/Ivy.scala
View File

@ -140,7 +140,8 @@ final class IvySbt(val configuration: IvyConfiguration) {
/**
* Cleans cached resolution cache.
* @param md - module descriptor of the original Ivy graph.
*
* @param md - module descriptor of the original Ivy graph.
*/
private[sbt] def cleanCachedResolutionCache(md: ModuleDescriptor, log: Logger): Unit =
withIvy(log) { i =>
@ -620,6 +621,12 @@ private[sbt] object IvySbt {
dependencyDescriptor.addExcludeRule(conf, IvyScala.excludeRule(excls.organization, excls.name, excls.configurations, excls.artifact))
}
}
for (incls <- dependency.inclusions) {
for (conf <- dependencyDescriptor.getModuleConfigurations) {
dependencyDescriptor.addIncludeRule(conf, IvyScala.includeRule(incls.organization, incls.name, incls.configurations, incls.artifact))
}
}
dependencyDescriptor
}
def copyConfigurations(artifact: Artifact, addConfiguration: String => Unit): Unit =