From a244509b67919f6c834456e722f17b34cd8d5f29 Mon Sep 17 00:00:00 2001 From: Jentsch Date: Sun, 19 Mar 2017 14:27:37 +0100 Subject: [PATCH] Replaced structural types by actual classes --- .../src/main/scala-2.10/coursier/Structure.scala | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/sbt-coursier/src/main/scala-2.10/coursier/Structure.scala b/sbt-coursier/src/main/scala-2.10/coursier/Structure.scala index 1b687fbb9..b043e0c50 100644 --- a/sbt-coursier/src/main/scala-2.10/coursier/Structure.scala +++ b/sbt-coursier/src/main/scala-2.10/coursier/Structure.scala @@ -6,12 +6,11 @@ import scala.language.implicitConversions // things from sbt-structure object Structure { - import Def.Initialize._ - def structure(state: State): Load.BuildStructure = + def structure(state: State): BuildStructure = sbt.Project.structure(state) - implicit def `enrich SettingKey`[T](key: SettingKey[T]) = new { + implicit class `enrich SettingKey`[T](key: SettingKey[T]) { def find(state: State): Option[T] = key.get(structure(state).data) @@ -22,7 +21,7 @@ object Structure { find(state).getOrElse(default) } - implicit def `enrich TaskKey`[T](key: TaskKey[T]) = new { + implicit class `enrich TaskKey`[T](key: TaskKey[T]) { def find(state: State): Option[sbt.Task[T]] = key.get(structure(state).data) @@ -33,10 +32,5 @@ object Structure { val tasks = projects.flatMap(p => key.in(p).get(structure(state).data).map(_.map(it => (p, it)))) std.TaskExtra.joinTasks(tasks).join.map(_.toMap) } - - def forAllConfigurations(state: State, configurations: Seq[sbt.Configuration]): sbt.Task[Map[sbt.Configuration, T]] = { - val tasks = configurations.flatMap(c => key.in(c).get(structure(state).data).map(_.map(it => (c, it)))) - std.TaskExtra.joinTasks(tasks).join.map(_.toMap) - } } }