From f6317a5c75001a8ab4e5f592593d6e2b9736ecf8 Mon Sep 17 00:00:00 2001 From: Mark Harrah Date: Wed, 19 Dec 2012 10:17:56 -0500 Subject: [PATCH] remove deprecated Extracted.evalTask --- main/src/main/scala/sbt/Extracted.scala | 2 -- main/src/main/scala/sbt/Main.scala | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/main/src/main/scala/sbt/Extracted.scala b/main/src/main/scala/sbt/Extracted.scala index 674196c1f..821080e62 100644 --- a/main/src/main/scala/sbt/Extracted.scala +++ b/main/src/main/scala/sbt/Extracted.scala @@ -24,8 +24,6 @@ final case class Extracted(structure: BuildStructure, session: SessionSettings, def getOpt[T](key: SettingKey[T]): Option[T] = structure.data.get(inCurrent(key), key.key) private[this] def inCurrent[T](key: SettingKey[T]): Scope = if(key.scope.project == This) key.scope.copy(project = Select(currentRef)) else key.scope - @deprecated("This method does not apply state changes requested during task execution. Use 'runTask' instead, which does.", "0.11.1") - def evalTask[T](key: TaskKey[T], state: State): T = runTask(key, state)._2 /** Runs the task specified by `key` and returns the transformed State and the resulting value of the task. * If the project axis is not defined for the key, it is resolved to be the current project. diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala index 866398193..9d3b0f527 100644 --- a/main/src/main/scala/sbt/Main.scala +++ b/main/src/main/scala/sbt/Main.scala @@ -112,7 +112,7 @@ object BuiltinCommands { val scalaVersion = e.getOpt(Keys.scalaVersion) val scalaHome = e.getOpt(Keys.scalaHome).flatMap(idFun) - val instance = e.getOpt(Keys.scalaInstance.task).flatMap(_ => quiet(e.evalTask(Keys.scalaInstance, s))) + val instance = e.getOpt(Keys.scalaInstance.task).flatMap(_ => quiet(e.runTask(Keys.scalaInstance, s)._2)) (scalaVersion, scalaHome, instance) match { case (sv, Some(home), Some(si)) => "local Scala version " + selectScalaVersion(sv, si) + " at " + home.getAbsolutePath case (_, Some(home), None) => "a local Scala build at " + home.getAbsolutePath