From 15f449849463a3e4e774877e51989be922988936 Mon Sep 17 00:00:00 2001
From: Maksym Fedorov <mfedorov@evolutiongaming.com>
Date: Tue, 6 Mar 2018 23:01:31 +0100
Subject: [PATCH] Add more configuration axis ScopeFilter factory methods

---
 main/src/main/scala/sbt/Defaults.scala               | 11 +++++++++++
 main/src/main/scala/sbt/ScopeFilter.scala            | 12 +++++++++++-
 .../in_configurations_scope_filter_factories.md      | 10 ++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 notes/1.1.2/in_configurations_scope_filter_factories.md

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index b9ab939ef..b67e62f52 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -2705,6 +2705,17 @@ object Classpaths {
     visit(projectRef, conf)
     visited.toSeq
   }
+
+  def interSortConfigurations(
+      projectRef: ProjectRef,
+      conf: Configuration,
+      data: Settings[Scope],
+      deps: BuildDependencies
+  ): Seq[(ProjectRef, ConfigRef)] =
+    interSort(projectRef, conf, data, deps).map {
+      case (projectRef, configName) => (projectRef, ConfigRef(configName))
+    }
+
   private[sbt] def unmanagedDependencies0(projectRef: ProjectRef,
                                           conf: Configuration,
                                           data: Settings[Scope],
diff --git a/main/src/main/scala/sbt/ScopeFilter.scala b/main/src/main/scala/sbt/ScopeFilter.scala
index a303ca09a..1139a176c 100644
--- a/main/src/main/scala/sbt/ScopeFilter.scala
+++ b/main/src/main/scala/sbt/ScopeFilter.scala
@@ -10,7 +10,7 @@ package sbt
 import sbt.internal.{ Load, LoadedBuildUnit }
 import sbt.internal.util.{ AttributeKey, Dag, Types }
 
-import sbt.librarymanagement.Configuration
+import sbt.librarymanagement.{ Configuration, ConfigRef }
 
 import Types.const
 import Def.Initialize
@@ -154,6 +154,16 @@ object ScopeFilter {
       selectAxis[ConfigKey](const(c => cs(c.name)))
     }
 
+    def inConfigurationsByKeys(keys: ConfigKey*): ConfigurationFilter = {
+      val cs = keys.toSet
+      selectAxis[ConfigKey](const(cs))
+    }
+
+    def inConfigurationsByRefs(refs: ConfigRef*): ConfigurationFilter = {
+      val cs = refs.map(r => ConfigKey(r.name)).toSet
+      selectAxis[ConfigKey](const(cs))
+    }
+
     implicit def settingKeyAll[T](key: Initialize[T]): SettingKeyAll[T] = new SettingKeyAll[T](key)
     implicit def taskKeyAll[T](key: Initialize[Task[T]]): TaskKeyAll[T] = new TaskKeyAll[T](key)
   }
diff --git a/notes/1.1.2/in_configurations_scope_filter_factories.md b/notes/1.1.2/in_configurations_scope_filter_factories.md
new file mode 100644
index 000000000..3effa6ac7
--- /dev/null
+++ b/notes/1.1.2/in_configurations_scope_filter_factories.md
@@ -0,0 +1,10 @@
+### Improvements
+
+- Adds factory methods for Configuration axis scope filters
+
+### More ways to create ScopeFilter for Configuration axis
+
+To create configuration axis `ScopeFilter` one has to provide actual configurations
+to filter by. However it's not always possible to get hold of one. For example
+`Classpaths.interSort` returns configuration names.
+For cases like that there are now `inConfigurationsByKeys` and `inConfigurationsByRefs` to create `ScopeFilter`'s