diff --git a/build.sbt b/build.sbt index 74535786f..becdb12cf 100644 --- a/build.sbt +++ b/build.sbt @@ -2,11 +2,11 @@ import Dependencies._ import Util._ import com.typesafe.tools.mima.core._, ProblemFilters._ -def baseVersion: String = "1.0.0-M18" +def baseVersion: String = "1.0.0-M19" def internalPath = file("internal") def commonSettings: Seq[Setting[_]] = Seq( - scalaVersion := scala211, + scalaVersion := scala212, // publishArtifact in packageDoc := false, resolvers += Resolver.typesafeIvyRepo("releases"), resolvers += Resolver.sonatypeRepo("snapshots"), 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 e39acb1dc..3c9bf0e9e 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 @@ -5,7 +5,7 @@ import java.io.{ PrintStream, PrintWriter } import java.util.Locale import java.util.concurrent.atomic.AtomicInteger import org.apache.logging.log4j.{ Level => XLevel } -import org.apache.logging.log4j.message.{ Message, ParameterizedMessage, ObjectMessage } +import org.apache.logging.log4j.message.{ Message, ParameterizedMessage, ObjectMessage, ReusableObjectMessage } import org.apache.logging.log4j.core.{ LogEvent => XLogEvent } import org.apache.logging.log4j.core.appender.AbstractAppender import org.apache.logging.log4j.core.layout.PatternLayout @@ -244,10 +244,11 @@ class ConsoleAppender private[ConsoleAppender] ( def messageToString(msg: Message): String = msg match { - case p: ParameterizedMessage => p.getFormattedMessage - case r: RingBufferLogEvent => r.getFormattedMessage - case o: ObjectMessage => objectToString(o.getParameter) - case _ => msg.toString + case p: ParameterizedMessage => p.getFormattedMessage + case r: RingBufferLogEvent => r.getFormattedMessage + case o: ObjectMessage => objectToString(o.getParameter) + case o: ReusableObjectMessage => objectToString(o.getParameter) + case _ => msg.getFormattedMessage } def objectToString(o: AnyRef): String = o match {