From 9eb718ae455d578ead3549df618d28357003deb5 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Thu, 1 Oct 2015 01:57:02 -0400 Subject: [PATCH] Fixes actions/depends-on --- main/settings/src/main/scala/sbt/Structure.scala | 12 ++++++------ project/Dependencies.scala | 2 +- sbt/src/main/scala/Import.scala | 4 ---- sbt/src/sbt-test/actions/depends-on/project/B.scala | 1 + 4 files changed, 8 insertions(+), 11 deletions(-) diff --git a/main/settings/src/main/scala/sbt/Structure.scala b/main/settings/src/main/scala/sbt/Structure.scala index 307fa2df3..cd1a84e61 100644 --- a/main/settings/src/main/scala/sbt/Structure.scala +++ b/main/settings/src/main/scala/sbt/Structure.scala @@ -216,7 +216,7 @@ object Scoped { final class RichInitializeTask[S](i: Initialize[Task[S]]) extends RichInitTaskBase[S, Task] { protected def onTask[T](f: Task[S] => Task[T]): Initialize[Task[T]] = i apply f - def dependsOn(tasks: AnyInitTask*): Initialize[Task[S]] = (i, Initialize.joinAny[Task, Any](tasks)) { (thisTask, deps) => thisTask.dependsOn(deps: _*) } + def dependsOn(tasks: AnyInitTask*): Initialize[Task[S]] = (i, Initialize.joinAny[Task](tasks)) { (thisTask, deps) => thisTask.dependsOn(deps: _*) } def failure: Initialize[Task[Incomplete]] = i(_.failure) def result: Initialize[Task[Result[S]]] = i(_.result) @@ -224,12 +224,12 @@ object Scoped { def xtriggeredBy[T](tasks: Initialize[Task[T]]*): Initialize[Task[S]] = nonLocal(tasks, Def.triggeredBy) def triggeredBy[T](tasks: Initialize[Task[T]]*): Initialize[Task[S]] = nonLocal(tasks, Def.triggeredBy) def runBefore[T](tasks: Initialize[Task[T]]*): Initialize[Task[S]] = nonLocal(tasks, Def.runBefore) - private[this] def nonLocal[T](tasks: Seq[Initialize[Task[T]]], key: AttributeKey[Seq[Task[_]]]): Initialize[Task[S]] = - (Initialize.joinAny[Task, T](tasks), i) { (ts, i) => i.copy(info = i.info.set(key, ts)) } + private[this] def nonLocal(tasks: Seq[AnyInitTask], key: AttributeKey[Seq[Task[_]]]): Initialize[Task[S]] = + (Initialize.joinAny[Task](tasks), i) { (ts, i) => i.copy(info = i.info.set(key, ts)) } } final class RichInitializeInputTask[S](i: Initialize[InputTask[S]]) extends RichInitTaskBase[S, InputTask] { protected def onTask[T](f: Task[S] => Task[T]): Initialize[InputTask[T]] = i(_ mapTask f) - def dependsOn(tasks: AnyInitTask*): Initialize[InputTask[S]] = (i, Initialize.joinAny[Task, Any](tasks)) { (thisTask, deps) => thisTask.mapTask(_.dependsOn(deps: _*)) } + def dependsOn(tasks: AnyInitTask*): Initialize[InputTask[S]] = (i, Initialize.joinAny[Task](tasks)) { (thisTask, deps) => thisTask.mapTask(_.dependsOn(deps: _*)) } } sealed abstract class RichInitTaskBase[S, R[_]] { @@ -259,7 +259,7 @@ object Scoped { def mapFailure[T](f: Incomplete => T): Initialize[R[T]] = mapR(f compose failM) } - type AnyInitTask = Initialize[Task[Any]] // forSome { type T } + type AnyInitTask = Initialize[Task[T]] forSome { type T } implicit def richTaskSeq[T](in: Seq[Initialize[Task[T]]]): RichTaskSeq[T] = new RichTaskSeq(in) final class RichTaskSeq[T](keys: Seq[Initialize[Task[T]]]) { @@ -268,7 +268,7 @@ object Scoped { } implicit def richAnyTaskSeq(in: Seq[AnyInitTask]): RichAnyTaskSeq = new RichAnyTaskSeq(in) final class RichAnyTaskSeq(keys: Seq[AnyInitTask]) { - def dependOn: Initialize[Task[Unit]] = Initialize.joinAny[Task, Any](keys).apply(deps => nop.dependsOn(deps: _*)) + def dependOn: Initialize[Task[Unit]] = Initialize.joinAny[Task](keys).apply(deps => nop.dependsOn(deps: _*)) } implicit def richFileSetting(s: SettingKey[File]): RichFileSetting = new RichFileSetting(s) diff --git a/project/Dependencies.scala b/project/Dependencies.scala index db8e747ef..c6304bb0c 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -9,7 +9,7 @@ object Dependencies { lazy val scala211 = "2.11.7" // sbt modules - val utilVersion = "0.1.0-M3" + val utilVersion = "0.1.0-M5" val ioVersion = "1.0.0-M3" val incremenalcompilerVersion = "0.1.0-M1-168cb7a4877917e01917e35b9b82a62afe5c2a01" val librarymanagementVersion = "0.1.0-M2" diff --git a/sbt/src/main/scala/Import.scala b/sbt/src/main/scala/Import.scala index 2b0b185f5..24ab5b520 100644 --- a/sbt/src/main/scala/Import.scala +++ b/sbt/src/main/scala/Import.scala @@ -137,9 +137,7 @@ object Import { type MultiLogger = sbt.internal.util.MultiLogger val MultiLoggerConfig = sbt.internal.util.MultiLoggerConfig type MultiLoggerConfig = sbt.internal.util.MultiLoggerConfig - type NewLine = sbt.internal.util.NewLine val NoPosition = sbt.internal.util.NoPosition - type Output = sbt.internal.util.Output val PMap = sbt.internal.util.PMap type PMap[K[_], V[_]] = sbt.internal.util.PMap[K, V] val Param = sbt.internal.util.Param @@ -148,7 +146,6 @@ object Import { type RMap[K[_], V[_]] = sbt.internal.util.RMap[K, V] val RangePosition = sbt.internal.util.RangePosition type RangePosition = sbt.internal.util.RangePosition - type RecordingLogger = sbt.internal.util.RecordingLogger val Relation = sbt.internal.util.Relation type Relation[A, B] = sbt.internal.util.Relation[A, B] type SBinaryFormats = sbt.internal.util.SBinaryFormats @@ -166,7 +163,6 @@ object Import { val StackTrace = sbt.internal.util.StackTrace type SuppressedTraceContext = sbt.internal.util.SuppressedTraceContext type Timestamp = sbt.internal.util.Timestamp - type ToLog = sbt.internal.util.ToLog val Tracked = sbt.internal.util.Tracked type Tracked = sbt.internal.util.Tracked type TranslatedException = sbt.internal.util.TranslatedException diff --git a/sbt/src/sbt-test/actions/depends-on/project/B.scala b/sbt/src/sbt-test/actions/depends-on/project/B.scala index 940f5121f..76120f6aa 100644 --- a/sbt/src/sbt-test/actions/depends-on/project/B.scala +++ b/sbt/src/sbt-test/actions/depends-on/project/B.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import Import._ // tests that errors are properly propagated for dependsOn, map, and flatMap object B extends Build