diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 2bc1c71ff..e491e58fe 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 11c9badb3..0542617c4 100644 --- a/main/src/main/scala/sbt/coursierint/LMCoursier.scala +++ b/main/src/main/scala/sbt/coursierint/LMCoursier.scala @@ -24,6 +24,7 @@ import sbt.librarymanagement.ivy.{ Credentials => IvyCredentials } import sbt.util.Logger import sbt.io.syntax._ import xsbti.AppConfiguration +import sbt.SlashSyntax0._ object LMCoursier { private[this] val credentialRegistry: ConcurrentHashMap[(String, String), IvyCredentials] = @@ -180,7 +181,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)