From 610bbf1113dd82f01eacc38548fc81ccabfd173b Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Tue, 20 Nov 2018 10:18:01 +0100 Subject: [PATCH] Minor tweaking --- .../coursier/sbtcoursier/DisplayTasks.scala | 55 +++++++++---------- 1 file changed, 26 insertions(+), 29 deletions(-) diff --git a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala index ac4d23c95..a47caa085 100644 --- a/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala +++ b/modules/sbt-coursier/src/main/scala/coursier/sbtcoursier/DisplayTasks.scala @@ -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) } } }