luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1255 from sbt/wip/remove-depreated-evaluate-task-call 

Remove deprecated EvaluateTask usage for new, easier to update variant.
This commit is contained in:
eugene yokota 2014-04-16 14:33:10 -04:00
parent 583391a069 004d9c3f4a
commit 72d3c4e3eb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
main/src/main/scala/sbt/GlobalPlugin.scala
View File

@ -57,10 +57,10 @@ object GlobalPlugin
} }
def evaluate[T](state: State, structure: BuildStructure, t: Task[T], roots: Seq[ScopedKey[_]]): (State, T) = def evaluate[T](state: State, structure: BuildStructure, t: Task[T], roots: Seq[ScopedKey[_]]): (State, T) =
{ {
import EvaluateTask._ import EvaluateTask._
withStreams(structure, state) { str => withStreams(structure, state) { str =>
val nv = nodeView(state, str, roots) val nv = nodeView(state, str, roots)
val config = EvaluateTask.defaultConfig(Project.extract(state), structure) val config = EvaluateTask.extractedTaskConfig(Project.extract(state), structure, state)
val (newS, result) = runTask(t, state, str, structure.index.triggers, config)(nv) val (newS, result) = runTask(t, state, str, structure.index.triggers, config)(nv)
(newS, processResult(result, newS.log)) (newS, processResult(result, newS.log))
} }