From 22d5fbad133b3542c1ab31281bbc3817230809bb Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Sun, 26 May 2019 19:10:59 -0700 Subject: [PATCH] Move external hooks definition I verified manually that ExternalHooks were still applied by default but that I could set the incOptions in the Test and Compile configs so that they weren't used. Fixes #4624 --- main/src/main/scala/sbt/Defaults.scala | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 5427f4f04..93ab73c9c 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -609,12 +609,8 @@ object Defaults extends BuildCommon { else "" s"inc_compile$extra.zip" }, - compileIncSetup := { - val base = compileIncSetupTask.value - val incOptions = - base.incrementalCompilerOptions.withExternalHooks(ExternalHooks.default.value) - base.withIncrementalCompilerOptions(incOptions) - }, + incOptions := { incOptions.value.withExternalHooks(ExternalHooks.default.value) }, + compileIncSetup := compileIncSetupTask.value, console := consoleTask.value, collectAnalyses := Definition.collectAnalysesTask.map(_ => ()).value, consoleQuick := consoleQuickTask.value,