From 166a421a2631be8ba705e8e0568646756788ff81 Mon Sep 17 00:00:00 2001
From: Adrien Piquerez <adrien.piquerez@gmail.com>
Date: Wed, 23 Dec 2020 11:12:16 +0100
Subject: [PATCH] Fix Scala 3 consoleProject and add scripted test

---
 main/src/main/scala/sbt/Defaults.scala                    | 1 +
 sbt/src/sbt-test/project/scala3-console-project/build.sbt | 3 +++
 sbt/src/sbt-test/project/scala3-console-project/test      | 1 +
 3 files changed, 5 insertions(+)
 create mode 100644 sbt/src/sbt-test/project/scala3-console-project/build.sbt
 create mode 100644 sbt/src/sbt-test/project/scala3-console-project/test

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index 46ed8b155..757772ab1 100644
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -675,6 +675,7 @@ object Defaults extends BuildCommon {
       else Def.task[Option[File]](None)
     }.value,
     scalaCompilerBridgeSource := ZincLmUtil.getDefaultBridgeSourceModule(scalaVersion.value),
+    consoleProject / scalaCompilerBridgeBinaryJar := None,
     consoleProject / scalaCompilerBridgeSource := ZincLmUtil.getDefaultBridgeSourceModule(
       appConfiguration.value.provider.scalaProvider.version
     ),
diff --git a/sbt/src/sbt-test/project/scala3-console-project/build.sbt b/sbt/src/sbt-test/project/scala3-console-project/build.sbt
new file mode 100644
index 000000000..208b8c684
--- /dev/null
+++ b/sbt/src/sbt-test/project/scala3-console-project/build.sbt
@@ -0,0 +1,3 @@
+ThisBuild / scalaVersion := "3.0.0-M2"
+
+lazy val root = project.in(file("."))
diff --git a/sbt/src/sbt-test/project/scala3-console-project/test b/sbt/src/sbt-test/project/scala3-console-project/test
new file mode 100644
index 000000000..b80db65f1
--- /dev/null
+++ b/sbt/src/sbt-test/project/scala3-console-project/test
@@ -0,0 +1 @@
+> consoleProject