From cd1d2e09944e01bdfc754706ee97a0d62e6a8f5e Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 8 Mar 2019 15:26:15 -0500
Subject: [PATCH] Util 1.3.0-M5

---
 build.sbt                          |  3 +++
 main/src/main/scala/sbt/Main.scala | 14 ++++++++++++++
 project/Dependencies.scala         |  2 +-
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index b8b9894ed..746e6b221 100644
--- a/build.sbt
+++ b/build.sbt
@@ -290,6 +290,9 @@ lazy val taskProj = (project in file("tasks"))
     testedBaseSettings,
     name := "Tasks",
     mimaSettings,
+    mimaBinaryIssueFilters ++= Seq(
+      exclude[ReversedMissingMethodProblem]("sbt.ExecuteProgress.stop")
+    )
   )
   .configure(addSbtUtilControl)
 
diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index 275ed4d3d..868986e5d 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -138,6 +138,20 @@ object StandardMain {
     // This is to workaround https://github.com/sbt/io/issues/110
     sys.props.put("jna.nosys", "true")
 
+    ConsoleAppender.setTerminalWidth(JLine.usingTerminal(_.getWidth))
+    ConsoleAppender.setShowProgress(
+      ConsoleAppender.formatEnabledInEnv && sys.props
+        .get("sbt.progress")
+        .flatMap({ s =>
+          ConsoleAppender.parseLogOption(s) match {
+            case LogOption.Always => Some(true)
+            case LogOption.Never  => Some(false)
+            case _                => None
+          }
+        })
+        .getOrElse(true)
+    )
+
     import BasicCommandStrings.isEarlyCommand
     val userCommands = configuration.arguments.map(_.trim)
     val (earlyCommands, normalCommands) = (preCommands ++ userCommands).partition(isEarlyCommand)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index cc9d1e0dd..1fd0b948d 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -10,7 +10,7 @@ object Dependencies {
 
   // sbt modules
   private val ioVersion = "1.3.0-M5"
-  private val utilVersion = "1.3.0-M4"
+  private val utilVersion = "1.3.0-M5"
   private val lmVersion =
     sys.props.get("sbt.build.lm.version") match {
       case Some(version) => version