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
This commit is contained in:
Ethan Atkins 2019-05-26 19:10:59 -07:00
parent 707972e190
commit 22d5fbad13
1 changed files with 2 additions and 6 deletions

View File

@ -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,