mirror of https://github.com/sbt/sbt.git
Expose excludeDependencies handling
This commit is contained in:
parent
64a75ab5a2
commit
92bde55a5a
|
|
@ -88,17 +88,12 @@ object Inputs {
|
|||
sets.values.toVector.distinct.map(_.set.toSet)
|
||||
}
|
||||
|
||||
def coursierProject(
|
||||
projId: ModuleID,
|
||||
dependencies: Seq[ModuleID],
|
||||
def exclusions(
|
||||
excludeDeps: Seq[InclExclRule],
|
||||
configurations: Seq[sbt.librarymanagement.Configuration],
|
||||
sv: String,
|
||||
sbv: String,
|
||||
log: Logger
|
||||
): Project = {
|
||||
|
||||
val exclusions = {
|
||||
): Set[(Organization, ModuleName)] = {
|
||||
|
||||
var anyNonSupportedExclusionRule = false
|
||||
|
||||
|
|
@ -121,6 +116,18 @@ object Inputs {
|
|||
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 proj = FromSbt.project(
|
||||
|
|
@ -134,7 +141,7 @@ object Inputs {
|
|||
proj.copy(
|
||||
dependencies = proj.dependencies.map {
|
||||
case (config, dep) =>
|
||||
(config, dep.copy(exclusions = dep.exclusions ++ exclusions))
|
||||
(config, dep.copy(exclusions = dep.exclusions ++ exclusions0))
|
||||
}
|
||||
)
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue