From f9bc9049eee9ef55b378d82d88fb367e8c92c05d Mon Sep 17 00:00:00 2001 From: Ethan Atkins Date: Thu, 8 Oct 2020 09:35:58 -0700 Subject: [PATCH] Set SimpleTerminal properties based on system props When running sbt 1.4.0 with -Dsbt.ci=true and -Dsbt.color=true, there is no color output. This was because in this scenario, a SimpleTerminal was used and isAnsiSupported and isColorEnabled were hardcoded to false rather than reading the values from the system properties. --- .../src/main/scala/sbt/internal/util/Terminal.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala index 839e41617..c48b5f6fa 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/Terminal.scala @@ -960,8 +960,8 @@ object Terminal { override def getStringCapability(capability: String): String = null override def getWidth: Int = 0 override def inputStream: InputStream = nullInputStream - override def isAnsiSupported: Boolean = false - override def isColorEnabled: Boolean = false + override def isAnsiSupported: Boolean = formatEnabledInEnv + override def isColorEnabled: Boolean = isColorEnabledProp.getOrElse(formatEnabledInEnv) override def isEchoEnabled: Boolean = false override def isSuccessEnabled: Boolean = true override def isSupershellEnabled: Boolean = false