From 00f7d1fab5c6047290675ccd4afe7e8173fdb5b8 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 12 Jul 2019 11:34:39 -0400
Subject: [PATCH] scope the reference of useSuperShell to ThisBuild

Fixes #4800
---
 main/src/main/scala/sbt/Defaults.scala                  | 2 +-
 main/src/main/scala/sbt/coursierint/LMCoursier.scala    | 3 ++-
 sbt/src/sbt-test/watch/input-parser/build.sbt           | 1 +
 sbt/src/sbt-test/watch/input-parser/project/Build.scala | 1 -
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala
index d103829ae..8b8a7e871 100755
--- a/main/src/main/scala/sbt/Defaults.scala
+++ b/main/src/main/scala/sbt/Defaults.scala
@@ -290,7 +290,7 @@ object Defaults extends BuildCommon {
       turbo :== SysProp.turbo,
       useSuperShell := { if (insideCI.value) false else SysProp.supershell },
       progressReports := {
-        val progress = useSuperShell.value
+        val progress = (ThisBuild / useSuperShell).value
         val rs = EvaluateTask.taskTimingProgress.toVector ++
           EvaluateTask.taskTraceEvent.toVector ++ {
           if (progress) Vector(EvaluateTask.taskProgress)
diff --git a/main/src/main/scala/sbt/coursierint/LMCoursier.scala b/main/src/main/scala/sbt/coursierint/LMCoursier.scala
index f84a19afa..f1a1aa658 100644
--- a/main/src/main/scala/sbt/coursierint/LMCoursier.scala
+++ b/main/src/main/scala/sbt/coursierint/LMCoursier.scala
@@ -22,6 +22,7 @@ import sbt.librarymanagement._
 import sbt.util.Logger
 import sbt.io.syntax._
 import xsbti.AppConfiguration
+import sbt.SlashSyntax0._
 
 object LMCoursier {
   def defaultCacheLocation: File =
@@ -175,7 +176,7 @@ object LMCoursier {
 
   def coursierLoggerTask: Def.Initialize[Task[Option[CacheLogger]]] = Def.task {
     val st = Keys.streams.value
-    val progress = useSuperShell.value
+    val progress = (ThisBuild / useSuperShell).value
     if (progress) None
     else Some(new CoursierLogger(st.log))
   }
diff --git a/sbt/src/sbt-test/watch/input-parser/build.sbt b/sbt/src/sbt-test/watch/input-parser/build.sbt
index 0e7f77deb..755a02a0f 100644
--- a/sbt/src/sbt-test/watch/input-parser/build.sbt
+++ b/sbt/src/sbt-test/watch/input-parser/build.sbt
@@ -1 +1,2 @@
+ThisBuild / useSuperShell := false
 val root = sbt.input.parser.Build.root
diff --git a/sbt/src/sbt-test/watch/input-parser/project/Build.scala b/sbt/src/sbt-test/watch/input-parser/project/Build.scala
index eb30bc8d8..903981e89 100644
--- a/sbt/src/sbt-test/watch/input-parser/project/Build.scala
+++ b/sbt/src/sbt-test/watch/input-parser/project/Build.scala
@@ -10,7 +10,6 @@ import sbt.nio.Keys._
 
 object Build {
   val root = (project in file(".")).settings(
-    useSuperShell := false,
     watchInputStream := inputStream,
     watchStartMessage := { (_, _, _) =>
       Build.outputStream.write('\n'.toByte)