From 2e6e061fe1a1b00dbaf1851340587d1a2d782039 Mon Sep 17 00:00:00 2001 From: Alexandre Archambault Date: Wed, 30 Dec 2015 01:34:47 +0100 Subject: [PATCH] Better minimization of dependencies with fallback configs --- .../shared/src/main/scala/coursier/core/Orders.scala | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/core/shared/src/main/scala/coursier/core/Orders.scala b/core/shared/src/main/scala/coursier/core/Orders.scala index d2bd8cdb7..15af6bfe2 100644 --- a/core/shared/src/main/scala/coursier/core/Orders.scala +++ b/core/shared/src/main/scala/coursier/core/Orders.scala @@ -122,8 +122,16 @@ object Orders { private def fallbackConfigIfNecessary(dep: Dependency, configs: Set[String]): Dependency = Parse.withFallbackConfig(dep.configuration) match { - case Some((main, fallback)) if !configs(main) && configs(fallback) => - dep.copy(configuration = fallback) + case Some((main, fallback)) => + val config0 = + if (configs(main)) + main + else if (configs(fallback)) + fallback + else + dep.configuration + + dep.copy(configuration = config0) case _ => dep }