From 794f87d0b971137e4d3708c2fc293551a9157ad7 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Mon, 3 Oct 2011 09:58:37 -0400 Subject: [PATCH] generalize classpath argument of consoleTask to ScopedTask --- main/Defaults.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Defaults.scala b/main/Defaults.scala index f2f92703c..44c8f5686 100644 --- a/main/Defaults.scala +++ b/main/Defaults.scala @@ -459,7 +459,7 @@ object Defaults extends BuildCommon def consoleProjectTask = (state, streams, initialCommands in consoleProject) map { (state, s, extra) => ConsoleProject(state, extra)(s.log); println() } def consoleTask: Initialize[Task[Unit]] = consoleTask(fullClasspath, console) def consoleQuickTask = consoleTask(externalDependencyClasspath, consoleQuick) - def consoleTask(classpath: TaskKey[Classpath], task: TaskKey[_]): Initialize[Task[Unit]] = (compilers in task, classpath, scalacOptions in task, initialCommands in task, streams) map { + def consoleTask(classpath: ScopedTask[Classpath], task: TaskKey[_]): Initialize[Task[Unit]] = (compilers in task, classpath in task, scalacOptions in task, initialCommands in task, streams) map { (cs, cp, options, initCommands, s) => (new Console(cs.scalac))(data(cp), options, initCommands, s.log).foreach(msg => error(msg)) println()