From ab674321dce1439f80593ba58186346c2934c1a8 Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 28 Sep 2018 02:27:45 -0400
Subject: [PATCH 1/2] Scala 2.12.7

---
 .travis.yml                                                   | 4 ++--
 .../src/main/scala/sbt/internal/util/ConsoleAppender.scala    | 3 +--
 project/Dependencies.scala                                    | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 31976b641..8436d27e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,7 +3,7 @@ jdk: oraclejdk8
 
 scala:
   - 2.11.12
-  - 2.12.6
+  - 2.12.7
 
 script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
   ++$TRAVIS_SCALA_VERSION
@@ -14,7 +14,7 @@ script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
 
 matrix:
   include:
-  - scala: 2.12.6
+  - scala: 2.12.7
     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 d5f6f7919..584fd9dd1 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,7 +8,6 @@ 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._
 
@@ -390,7 +389,7 @@ class ConsoleAppender private[ConsoleAppender] (
       message: String
   ): Unit =
     out.lockObject.synchronized {
-      new StringOps(message).lines.foreach { line =>
+      message.linesIterator.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)
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index 6d51c107f..3437b7f0f 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -5,7 +5,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
 object Dependencies {
   val scala210 = "2.10.7"
   val scala211 = "2.11.12"
-  val scala212 = "2.12.6"
+  val scala212 = "2.12.7"
 
   private val ioVersion = "1.2.1"
 

From 5ea9ee159c22ce3e6f7b80edf971cae804c9d00c Mon Sep 17 00:00:00 2001
From: Eugene Yokota <eed3si9n@gmail.com>
Date: Fri, 28 Sep 2018 02:28:12 -0400
Subject: [PATCH 2/2] 1.3.0

---
 build.sbt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.sbt b/build.sbt
index 58c1dcdc6..28b92091e 100644
--- a/build.sbt
+++ b/build.sbt
@@ -45,7 +45,7 @@ lazy val utilRoot: Project = (project in file("."))
   .settings(
     inThisBuild(
       Seq(
-        git.baseVersion := "1.2.2",
+        git.baseVersion := "1.3.0",
         version := {
           val v = version.value
           if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT"