From 4a6feb2b2382267c5f241df0c6230e904108d067 Mon Sep 17 00:00:00 2001 From: Dale Wijnand Date: Thu, 30 Mar 2017 12:26:49 +0100 Subject: [PATCH] Switch Defaults.runnerTask back to a setting I believe this was an unintentional change in 74cfbd4a9ca162dbe9d6fc236ac19671ff16d951. --- main/src/main/scala/sbt/Defaults.scala | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 50beb5a50..fb7d4e07e 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -898,7 +898,7 @@ object Defaults extends BuildCommon { scalaRun.value.run(mainClass, data(classpath.value), parser.parsed, streams.value.log).get } } - def runnerTask: Initialize[Task[ScalaRun]] = runnerInit + def runnerTask: Setting[Task[ScalaRun]] = runner := runnerInit.value def runnerInit: Initialize[Task[ScalaRun]] = Def.task { val tmp = taskTemporaryDirectory.value val resolvedScope = resolvedScoped.value.scope @@ -1201,11 +1201,8 @@ object Defaults extends BuildCommon { // 1. runnerSettings is added unscoped via JvmPlugin. // 2. In addition it's added scoped to run task. - lazy val runnerSettings: Seq[Setting[_]] = - Seq( - runner := runnerInit.value, - forkOptions := forkOptionsTask.value - ) + lazy val runnerSettings: Seq[Setting[_]] = Seq(runnerTask, forkOptions := forkOptionsTask.value) + lazy val baseTasks: Seq[Setting[_]] = projectTasks ++ packageBase lazy val configSettings: Seq[Setting[_]] = Classpaths.configSettings ++ configTasks ++ configPaths ++ packageConfig ++ Classpaths.compilerPluginConfig ++ deprecationSettings