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

Expose excludeDependencies handling

This commit is contained in:
Alexandre Archambault 2018-11-20 14:31:49 +01:00
parent 64a75ab5a2
commit 92bde55a5a
1 changed files with 30 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/lm-coursier/src/main/scala/coursier/lmcoursier/Inputs.scala
View File

@ -88,17 +88,12 @@ object Inputs {
sets.values.toVector.distinct.map(_.set.toSet) sets.values.toVector.distinct.map(_.set.toSet)
} }
def coursierProject( def exclusions(
projId: ModuleID,
dependencies: Seq[ModuleID],
excludeDeps: Seq[InclExclRule], excludeDeps: Seq[InclExclRule],
configurations: Seq[sbt.librarymanagement.Configuration],
sv: String, sv: String,
sbv: String, sbv: String,
log: Logger log: Logger
): Project = { ): Set[(Organization, ModuleName)] = {
val exclusions = {
var anyNonSupportedExclusionRule = false var anyNonSupportedExclusionRule = false
@ -121,6 +116,18 @@ object Inputs {
res res
} }
def coursierProject(
projId: ModuleID,
dependencies: Seq[ModuleID],
excludeDeps: Seq[InclExclRule],
configurations: Seq[sbt.librarymanagement.Configuration],
sv: String,
sbv: String,
log: Logger
): Project = {
val exclusions0 = exclusions(excludeDeps, sv, sbv, log)
val configMap = configExtends(configurations) val configMap = configExtends(configurations)
val proj = FromSbt.project( val proj = FromSbt.project(
@ -134,7 +141,7 @@ object Inputs {
proj.copy( proj.copy(
dependencies = proj.dependencies.map { dependencies = proj.dependencies.map {
case (config, dep) => case (config, dep) =>
(config, dep.copy(exclusions = dep.exclusions ++ exclusions)) (config, dep.copy(exclusions = dep.exclusions ++ exclusions0))
} }
) )
} }