luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4858 from eed3si9n/wip/thisbuild 

scope the reference of useSuperShell to ThisBuild
This commit is contained in:
eugene yokota 2019-07-12 15:21:57 -04:00 committed by GitHub
parent 5c3eff52d4 00f7d1fab5
commit 2af6ad5713
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main/src/main/scala/sbt/Defaults.scala
View File

@ -290,7 +290,7 @@ object Defaults extends BuildCommon {
turbo :== SysProp.turbo, turbo :== SysProp.turbo,
useSuperShell := { if (insideCI.value) false else SysProp.supershell }, useSuperShell := { if (insideCI.value) false else SysProp.supershell },
progressReports := { progressReports := {
val progress = useSuperShell.value val progress = (ThisBuild / useSuperShell).value
val rs = EvaluateTask.taskTimingProgress.toVector ++ val rs = EvaluateTask.taskTimingProgress.toVector ++
EvaluateTask.taskTraceEvent.toVector ++ { EvaluateTask.taskTraceEvent.toVector ++ {
if (progress) Vector(EvaluateTask.taskProgress) if (progress) Vector(EvaluateTask.taskProgress)

3
main/src/main/scala/sbt/coursierint/LMCoursier.scala
View File

@ -24,6 +24,7 @@ import sbt.librarymanagement.ivy.{ Credentials => IvyCredentials }
import sbt.util.Logger import sbt.util.Logger
import sbt.io.syntax._ import sbt.io.syntax._
import xsbti.AppConfiguration import xsbti.AppConfiguration
import sbt.SlashSyntax0._
object LMCoursier { object LMCoursier {
private[this] val credentialRegistry: ConcurrentHashMap[(String, String), IvyCredentials] = private[this] val credentialRegistry: ConcurrentHashMap[(String, String), IvyCredentials] =
@ -180,7 +181,7 @@ object LMCoursier {
def coursierLoggerTask: Def.Initialize[Task[Option[CacheLogger]]] = Def.task { def coursierLoggerTask: Def.Initialize[Task[Option[CacheLogger]]] = Def.task {
val st = Keys.streams.value val st = Keys.streams.value
val progress = useSuperShell.value val progress = (ThisBuild / useSuperShell).value
if (progress) None if (progress) None
else Some(new CoursierLogger(st.log)) else Some(new CoursierLogger(st.log))
} }

1
sbt/src/sbt-test/watch/input-parser/build.sbt
View File

@ -1 +1,2 @@
ThisBuild / useSuperShell := false
val root = sbt.input.parser.Build.root val root = sbt.input.parser.Build.root

1
sbt/src/sbt-test/watch/input-parser/project/Build.scala
View File

@ -10,7 +10,6 @@ import sbt.nio.Keys._
object Build { object Build {
val root = (project in file(".")).settings( val root = (project in file(".")).settings(
useSuperShell := false,
watchInputStream := inputStream, watchInputStream := inputStream,
watchStartMessage := { (_, _, _) => watchStartMessage := { (_, _, _) =>
Build.outputStream.write('\n'.toByte) Build.outputStream.write('\n'.toByte)