mirror of https://github.com/sbt/sbt.git
parent
d9af39c90c
commit
00f7d1fab5
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
ThisBuild / useSuperShell := false
|
||||
val root = sbt.input.parser.Build.root
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue