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

Merge pull request #4647 from eed3si9n/wip/progress 

Remove State out of progressReports
This commit is contained in:
eugene yokota 2019-05-03 17:51:51 -04:00 committed by GitHub
parent ac15eb516f e8a22bf805
commit f5edeec2fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 7 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

@ -296,7 +296,7 @@ object Defaults extends BuildCommon {
() => Clean.deleteContents(tempDirectory, _ => false) () => Clean.deleteContents(tempDirectory, _ => false)
}, },
useSuperShell := { if (insideCI.value) false else sbt.internal.TaskProgress.isEnabled }, useSuperShell := { if (insideCI.value) false else sbt.internal.TaskProgress.isEnabled },
progressReports := { (s: State) => progressReports := {
val progress = useSuperShell.value val progress = useSuperShell.value
val rs = EvaluateTask.taskTimingProgress.toVector ++ val rs = EvaluateTask.taskTimingProgress.toVector ++
EvaluateTask.taskTraceEvent.toVector ++ { EvaluateTask.taskTraceEvent.toVector ++ {

7
main/src/main/scala/sbt/EvaluateTask.scala
View File

@ -234,14 +234,13 @@ object EvaluateTask {
structure: BuildStructure, structure: BuildStructure,
state: State state: State
): ExecuteProgress[Task] = { ): ExecuteProgress[Task] = {
import Types.const val maker: Seq[Keys.TaskProgress] = getSetting(
val maker: State => Seq[Keys.TaskProgress] = getSetting(
Keys.progressReports, Keys.progressReports,
const(Seq()), Seq(),
extracted, extracted,
structure structure
) )
val reporters = maker(state) map { _.progress } val reporters = maker map { _.progress }
// configure the logger for super shell // configure the logger for super shell
ConsoleAppender.setShowProgress((reporters collect { ConsoleAppender.setShowProgress((reporters collect {
case p: TaskProgress => () case p: TaskProgress => ()

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

@ -473,7 +473,7 @@ object Keys {
} }
val useSuperShell = settingKey[Boolean]("Enables (true) or disables the super shell.") val useSuperShell = settingKey[Boolean]("Enables (true) or disables the super shell.")
// This key can be used to add custom ExecuteProgress instances // This key can be used to add custom ExecuteProgress instances
val progressReports = settingKey[State => Seq[TaskProgress]]("A function that returns a list of progress reporters.").withRank(DTask) val progressReports = settingKey[Seq[TaskProgress]]("A function that returns a list of progress reporters.").withRank(DTask)
private[sbt] val postProgressReports = settingKey[Unit]("Internally used to modify logger.").withRank(DTask) private[sbt] val postProgressReports = settingKey[Unit]("Internally used to modify logger.").withRank(DTask)
@deprecated("No longer used", "1.3.0") @deprecated("No longer used", "1.3.0")
private[sbt] val executeProgress = settingKey[State => TaskProgress]("Experimental task execution listener.").withRank(DTask) private[sbt] val executeProgress = settingKey[State => TaskProgress]("Experimental task execution listener.").withRank(DTask)

2
project/build.properties
View File

@ -1 +1 @@
sbt.version=1.3.0-M2 sbt.version=1.3.0-M3