Merge pull request #157 from eed3si9n/wip/merge-1.1.x

merge 1.1.x

build.sbt

@@ -32,7 +32,7 @@ def commonSettings: Seq[Setting[_]] = Seq(
 val mimaSettings = Def settings (
   mimaPreviousArtifacts := Set(
     "1.0.0", "1.0.1", "1.0.2", "1.0.3",
-    "1.1.0", "1.1.1", "1.1.2",
+    "1.1.0", "1.1.1", "1.1.2", "1.1.3"
   ) map (version =>
     organization.value %% moduleName.value % version
       cross (if (crossPaths.value) CrossVersion.binary else CrossVersion.disabled)
@@ -56,7 +56,7 @@ lazy val utilRoot: Project = (project in file("."))
         git.baseVersion := "1.2.0",
         version := {
           val v = version.value
-          if (v contains "SNAPSHOT") git.baseVersion.value
+          if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT"
           else v
         },
         bintrayPackage := "util",

internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala

@@ -353,8 +353,10 @@ class ConsoleAppender private[ConsoleAppender] (
    * @param msg    The message to format
    * @return The formatted message.
    */
-  private def formatted(format: String, msg: String): String =
-    s"$reset${format}${msg}$reset"
+  private def formatted(format: String, msg: String): String = {
+    val builder = new java.lang.StringBuilder(reset.length * 2 + format.length + msg.length)
+    builder.append(reset).append(format).append(msg).append(reset).toString
+  }
 
   /**
    * Select the right color for the label given `level`.
@@ -388,9 +390,14 @@ class ConsoleAppender private[ConsoleAppender] (
   ): Unit =
     out.lockObject.synchronized {
       message.lines.foreach { line =>
-        val labeledLine =
-          s"$reset[${formatted(labelColor, label)}] ${formatted(messageColor, line)}"
-        write(labeledLine)
+        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)
+        builder.append(reset).append('[')
+        fmted(labelColor, label)
+        builder.append("] ")
+        fmted(messageColor, line)
+        write(builder.toString)
       }
     }
 

internal/util-logging/src/main/scala/sbt/internal/util/ConsoleOut.scala

@@ -37,7 +37,7 @@ object ConsoleOut {
         lockObject.print(OverwriteLine)
       lockObject.println(s)
       last = Some(s)
-      current = new java.lang.StringBuffer
+      current.setLength(0)
     }
   }
 

internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala

@@ -25,9 +25,11 @@ class ManagedLogger(
     )
   }
 
+  private val SuccessEventTag = scala.reflect.runtime.universe.typeTag[SuccessEvent]
   // send special event for success since it's not a real log level
   override def success(message: => String): Unit = {
-    infoEvent[SuccessEvent](SuccessEvent(message))
+    infoEvent[SuccessEvent](SuccessEvent(message))(implicitly[JsonFormat[SuccessEvent]],
+                                                   SuccessEventTag)
   }
 
   def registerStringCodec[A: ShowLines: TypeTag]: Unit = {

project/build.properties

@@ -1 +1 @@
-sbt.version=1.1.1
+sbt.version=1.1.2