From 71bc3876d9704095db09790f147337a936b33da9 Mon Sep 17 00:00:00 2001
From: Jason Pickens <jason.pickens@lightbend.com>
Date: Thu, 28 Nov 2019 20:29:31 +1300
Subject: [PATCH] Scope compiler bridge to consoleProject

---
 main/src/main/scala/sbt/Defaults.scala                     | 3 +++
 main/src/main/scala/sbt/internal/ConsoleProject.scala      | 5 +++--
 sbt/src/sbt-test/console/project-compiler-bridge/build.sbt | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 348830e5b..2967f16a3 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -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(
diff --git a/main/src/main/scala/sbt/internal/ConsoleProject.scala b/main/src/main/scala/sbt/internal/ConsoleProject.scala
index 737bd8609..9ea6a14c7 100644
--- a/main/src/main/scala/sbt/internal/ConsoleProject.scala
+++ b/main/src/main/scala/sbt/internal/ConsoleProject.scala
@@ -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
diff --git a/sbt/src/sbt-test/console/project-compiler-bridge/build.sbt b/sbt/src/sbt-test/console/project-compiler-bridge/build.sbt
index 12233ca71..3c4ba1908 100644
--- a/sbt/src/sbt-test/console/project-compiler-bridge/build.sbt
+++ b/sbt/src/sbt-test/console/project-compiler-bridge/build.sbt
@@ -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!"