From 668a0379eb798b4d76a0976aee18a279370d12dc Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 3 May 2019 16:43:52 -0400 Subject: [PATCH 1/2] sbt 1.3.0-M3 --- project/build.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/build.properties b/project/build.properties index 3149e6ba1..c59667ce9 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.3.0-M2 +sbt.version=1.3.0-M3 From e8a22bf8054d91cfc75f1339926c6a615f1e1e29 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Fri, 3 May 2019 16:44:42 -0400 Subject: [PATCH 2/2] Remove State out of progressReports --- main/src/main/scala/sbt/Defaults.scala | 2 +- main/src/main/scala/sbt/EvaluateTask.scala | 7 +++---- main/src/main/scala/sbt/Keys.scala | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/main/src/main/scala/sbt/Defaults.scala b/main/src/main/scala/sbt/Defaults.scala index 0a4a43167..5c43452c2 100755 --- a/main/src/main/scala/sbt/Defaults.scala +++ b/main/src/main/scala/sbt/Defaults.scala @@ -296,7 +296,7 @@ object Defaults extends BuildCommon { () => Clean.deleteContents(tempDirectory, _ => false) }, useSuperShell := { if (insideCI.value) false else sbt.internal.TaskProgress.isEnabled }, - progressReports := { (s: State) => + progressReports := { val progress = useSuperShell.value val rs = EvaluateTask.taskTimingProgress.toVector ++ EvaluateTask.taskTraceEvent.toVector ++ { diff --git a/main/src/main/scala/sbt/EvaluateTask.scala b/main/src/main/scala/sbt/EvaluateTask.scala index cf233a17d..aa3191a47 100644 --- a/main/src/main/scala/sbt/EvaluateTask.scala +++ b/main/src/main/scala/sbt/EvaluateTask.scala @@ -234,14 +234,13 @@ object EvaluateTask { structure: BuildStructure, state: State ): ExecuteProgress[Task] = { - import Types.const - val maker: State => Seq[Keys.TaskProgress] = getSetting( + val maker: Seq[Keys.TaskProgress] = getSetting( Keys.progressReports, - const(Seq()), + Seq(), extracted, structure ) - val reporters = maker(state) map { _.progress } + val reporters = maker map { _.progress } // configure the logger for super shell ConsoleAppender.setShowProgress((reporters collect { case p: TaskProgress => () diff --git a/main/src/main/scala/sbt/Keys.scala b/main/src/main/scala/sbt/Keys.scala index fa7965170..fc5c4db35 100644 --- a/main/src/main/scala/sbt/Keys.scala +++ b/main/src/main/scala/sbt/Keys.scala @@ -473,7 +473,7 @@ object Keys { } val useSuperShell = settingKey[Boolean]("Enables (true) or disables the super shell.") // 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) @deprecated("No longer used", "1.3.0") private[sbt] val executeProgress = settingKey[State => TaskProgress]("Experimental task execution listener.").withRank(DTask)