From d8362761deb3741758008b09fd2f4929e1d7d4de Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Sat, 30 Jul 2011 18:11:20 -0400 Subject: [PATCH] fix fullRun*Task not doing work. missed by compiler due to value discarding --- main/Defaults.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index 08472c9c3..1a109f581 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -1022,16 +1022,16 @@ trait BuildExtra extends BuildCommon def fullRunInputTask(scoped: ScopedInput[Unit], config: Configuration, mainClass: String, baseArguments: String*): Setting[InputTask[Unit]] = scoped <<= inputTask { result => ( initScoped(scoped.scoped, runnerInit) zipWith (fullClasspath in config, streams, result).identityMap) { (rTask, t) => - t map { case (cp, s, args) => rTask map { r => + (t :^: rTask :^: KNil) map { case (cp, s, args) :+: r :+: HNil => toError(r.run(mainClass, data(cp), baseArguments ++ args, s.log)) - }} + } } } def fullRunTask(scoped: ScopedTask[Unit], config: Configuration, mainClass: String, arguments: String*): Setting[Task[Unit]] = scoped <<= ( initScoped(scoped.scoped, runnerInit) zipWith (fullClasspath in config, streams).identityMap ) { case (rTask, t) => - t map { case (cp, s) => rTask map { r => + (t :^: rTask :^: KNil) map { case (cp, s) :+: r :+: HNil => toError(r.run(mainClass, data(cp), arguments, s.log)) - }} + } } def initScoped[T](sk: ScopedKey[_], i: Initialize[T]): Initialize[T] = initScope(fillTaskAxis(sk.scope, sk.key), i) def initScope[T](s: Scope, i: Initialize[T]): Initialize[T] = i mapReferenced Project.mapScope(Scope.replaceThis(s))