support sbt 1.1

.travis.yml

@@ -5,6 +5,8 @@ matrix:
     jdk: openjdk7
   - env: SBT_VERSION="1.0.4"
     jdk: oraclejdk8
+  - env: SBT_VERSION="1.1.0-RC1"
+    jdk: oraclejdk8
 script:
  - git config --global user.email "example@example.com"
  - git config --global user.name "example"

src/main/scala-sbt-0.13/Compat.scala

@@ -68,4 +68,19 @@ object Compat {
   val KeyIndex = sbt.KeyIndex
   type LoadedBuildUnit = sbt.LoadedBuildUnit
 
+  private[sbtrelease] def keyIndexApply(
+    known: Iterable[ScopedKey[_]],
+    projects: Map[URI, Set[String]],
+    configurations: Map[String, Seq[Configuration]]
+  ) = {
+    KeyIndex.apply(known = known, projects = projects)
+  }
+
+  private[sbtrelease] def keyIndexAggregate(known: Iterable[ScopedKey[_]],
+                extra: BuildUtil[_],
+                projects: Map[URI, Set[String]],
+                configurations: Map[String, Seq[Configuration]]) = {
+    KeyIndex.aggregate(known = known, extra = extra, projects = projects)
+  }
+
 }

src/main/scala-sbt-1.0/Compat.scala

@@ -5,7 +5,7 @@ import sbt.Def.ScopedKey
 import sbt.EvaluateTask.{extractedTaskConfig, nodeView, runTask, withStreams}
 import sbt.Keys._
 import sbt.internal.Aggregation.KeyValue
-import sbt.internal.{Act, Aggregation}
+import sbt.internal.{Act, Aggregation, ExtendableKeyIndex}
 import sbt.std.Transform.DummyTaskMap
 
 object Compat {
@@ -81,4 +81,56 @@ object Compat {
   type KeyIndex = sbt.internal.KeyIndex
   val KeyIndex = sbt.internal.KeyIndex
   type LoadedBuildUnit = sbt.internal.LoadedBuildUnit
+
+  // https://github.com/sbt/sbt/issues/3792
+  private[sbtrelease] def keyIndexApply(
+    known: Iterable[ScopedKey[_]],
+    projects: Map[URI, Set[String]],
+    configurations: Map[String, Seq[Configuration]]
+  ): ExtendableKeyIndex = try {
+    // for sbt 1.1
+    KeyIndex.asInstanceOf[{
+      def apply(
+        known: Iterable[ScopedKey[_]],
+        projects: Map[URI, Set[String]],
+        configurations: Map[String, Seq[Configuration]]
+      ): ExtendableKeyIndex
+    }].apply(known = known, projects = projects, configurations = configurations)
+  } catch {
+    case _: NoSuchMethodException =>
+      // for sbt 1.0.x
+      KeyIndex.asInstanceOf[{
+        def apply(
+          known: Iterable[ScopedKey[_]],
+          projects: Map[URI, Set[String]],
+        ): ExtendableKeyIndex
+      }].apply(known = known, projects = projects)
+  }
+
+  // https://github.com/sbt/sbt/issues/3792
+  private[sbtrelease] def keyIndexAggregate(known: Iterable[ScopedKey[_]],
+                extra: BuildUtil[_],
+                projects: Map[URI, Set[String]],
+                configurations: Map[String, Seq[Configuration]]) = try {
+    // for sbt 1.1
+    KeyIndex.asInstanceOf[{
+      def aggregate(
+        known: Iterable[ScopedKey[_]],
+        extra: BuildUtil[_],
+        projects: Map[URI, Set[String]],
+        configurations: Map[String, Seq[Configuration]]
+      ): ExtendableKeyIndex
+    }].aggregate(known = known, extra = extra, projects = projects, configurations = configurations)
+  } catch {
+    case _: NoSuchMethodException =>
+      // for sbt 1.0.x
+      KeyIndex.asInstanceOf[{
+        def aggregate(
+          known: Iterable[ScopedKey[_]],
+          extra: BuildUtil[_],
+          projects: Map[URI, Set[String]]
+        ): ExtendableKeyIndex
+      }].aggregate(known = known, extra = extra, projects = projects)
+  }
+
 }

src/main/scala/Load.scala

@@ -55,8 +55,10 @@ object Load {
     val attributeKeys = Index.attributeKeys(data) ++ keys.map(_.key)
     val scopedKeys = keys ++ data.allKeys((s, k) => ScopedKey(s, k)).toVector
     val projectsMap = projects.mapValues(_.defined.keySet)
-    val keyIndex = KeyIndex(scopedKeys.toVector, projectsMap)
-    val aggIndex = KeyIndex.aggregate(scopedKeys.toVector, extra(keyIndex), projectsMap)
+    val configsMap: Map[String, Seq[Configuration]] =
+      projects.values.flatMap(bu => bu.defined map { case (k, v) => (k, v.configurations) }).toMap
+    val keyIndex = keyIndexApply(scopedKeys.toVector, projectsMap, configsMap)
+    val aggIndex = keyIndexAggregate(scopedKeys.toVector, extra(keyIndex), projectsMap, configsMap)
     new StructureIndex(Index.stringToKeyMap(attributeKeys), Index.taskToKeyMap(data), Index.triggers(data), keyIndex, aggIndex)
   }