From e121d969c4d353e9d118447895c89a6df255b500 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 22 Sep 2018 00:55:00 -0400 Subject: [PATCH] openjdk11 --- .travis.yml | 2 +- .../src/main/scala/sbt/internal/util/ConsoleAppender.scala | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cd42eff8c..31976b641 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M matrix: include: - scala: 2.12.6 - jdk: oraclejdk9 + jdk: openjdk11 - scala: 2.10.6 script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION compile" diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala index 3e1d07da5..d5f6f7919 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala @@ -8,6 +8,7 @@ import org.apache.logging.log4j.{ Level => XLevel } import org.apache.logging.log4j.message.{ Message, ObjectMessage, ReusableObjectMessage } import org.apache.logging.log4j.core.{ LogEvent => XLogEvent } import org.apache.logging.log4j.core.appender.AbstractAppender +import scala.collection.immutable.StringOps import ConsoleAppender._ @@ -389,7 +390,7 @@ class ConsoleAppender private[ConsoleAppender] ( message: String ): Unit = out.lockObject.synchronized { - message.lines.foreach { line => + new StringOps(message).lines.foreach { line => val builder = new java.lang.StringBuilder( labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3) def fmted(a: String, b: String) = builder.append(reset).append(a).append(b).append(reset)