Scope compiler bridge to consoleProject

This commit is contained in:
Jason Pickens 2019-11-28 20:29:31 +13:00
parent 8c3245d569
commit 71bc3876d9
No known key found for this signature in database
GPG Key ID: C4A8C75C7876F1B5
3 changed files with 7 additions and 3 deletions

View File

@ -488,6 +488,9 @@ object Defaults extends BuildCommon {
clean := clean.dependsOn(cleanIvy).value,
scalaCompilerBridgeBinaryJar := None,
scalaCompilerBridgeSource := ZincLmUtil.getDefaultBridgeModule(scalaVersion.value),
consoleProject / scalaCompilerBridgeSource := ZincLmUtil.getDefaultBridgeModule(
appConfiguration.value.provider.scalaProvider.version
),
)
// must be a val: duplication detected by object identity
private[this] lazy val compileBaseGlobal: Seq[Setting[_]] = globalDefaults(

View File

@ -25,7 +25,7 @@ object ConsoleProject {
val (state1, dependencyResolution) =
extracted.runTask(Keys.dependencyResolution, state)
val (_, scalaCompilerBridgeBinaryJar) =
extracted.runTask(Keys.scalaCompilerBridgeBinaryJar, state1)
extracted.runTask(Keys.scalaCompilerBridgeBinaryJar.in(Keys.consoleProject), state1)
val scalaInstance = {
val scalaProvider = state.configuration.provider.scalaProvider
ScalaInstance(scalaProvider.version, scalaProvider.launcher)
@ -50,7 +50,8 @@ object ConsoleProject {
componentProvider = app.provider.components,
secondaryCacheDir = Option(zincDir),
dependencyResolution = dependencyResolution,
compilerBridgeSource = extracted.get(Keys.scalaCompilerBridgeSource),
compilerBridgeSource =
extracted.get(Keys.scalaCompilerBridgeSource.in(Keys.consoleProject)),
scalaJarsTarget = zincDir,
classLoaderCache = state1.get(BasicKeys.classLoaderCache),
log = log

View File

@ -2,4 +2,4 @@ scalaVersion := "2.13.1"
// Send some bogus initial command so that it doesn't get stuck.
// The task itself will still succeed.
Compile / consoleProject / initialCommands := "bail!"
consoleProject / initialCommands := "bail!"