Minor tweaking

This commit is contained in:
Alexandre Archambault 2018-11-20 10:18:01 +01:00
parent af041251c1
commit 610bbf1113
1 changed files with 26 additions and 29 deletions

View File

@ -33,44 +33,41 @@ object DisplayTasks {
proj.copy(publications = publications)
}
Def.taskDyn {
val resolutionsTask =
if (sbtClassifiers)
Def.task {
val currentProject = currentProjectTask.value
val classifiersRes = coursierSbtClassifiersResolution.value
Map(currentProject.configurations.keySet -> classifiersRes)
}
else
Def.task(coursierResolutions.value)
Def.task {
val currentProject = currentProjectTask.value
val config = Configuration(configuration.value.name)
val configs = coursierConfigurations.value
val includedConfigs = configs.getOrElse(config, Set.empty) + config
Def.taskDyn {
val currentProject = currentProjectTask.value
val resolutions = resolutionsTask.value
val resolutionsTask =
if (sbtClassifiers)
Def.task {
val classifiersRes = coursierSbtClassifiersResolution.value
Map(currentProject.configurations.keySet -> classifiersRes)
}
else
Def.task(coursierResolutions.value)
for {
(subGraphConfigs, res) <- resolutions.toSeq
if subGraphConfigs.exists(includedConfigs)
} yield {
Def.task {
val resolutions = resolutionsTask.value
for {
(subGraphConfigs, res) <- resolutions.toSeq
if subGraphConfigs.exists(includedConfigs)
} yield {
val dependencies0 = currentProject.dependencies.collect {
case (cfg, dep) if includedConfigs(cfg) && subGraphConfigs(cfg) => dep
}.sortBy { dep =>
(dep.module.organization, dep.module.name, dep.version)
}
val subRes = res.subset(dependencies0.toSet)
ResolutionResult(subGraphConfigs, subRes, dependencies0)
}
val dependencies0 = currentProject.dependencies.collect {
case (cfg, dep) if includedConfigs(cfg) && subGraphConfigs(cfg) => dep
}.sortBy { dep =>
(dep.module.organization, dep.module.name, dep.version)
}
val subRes = res.subset(dependencies0.toSet)
ResolutionResult(subGraphConfigs, subRes, dependencies0)
}
}
}