luke
/
sbt
mirror of https://github.com/sbt/sbt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #182 from eed3si9n/wip/2127 

Scala 2.12.7
This commit is contained in:
eugene yokota 2018-09-28 02:37:21 -04:00 committed by GitHub
parent dbd17e63e2 5ea9ee159c
commit 256e9a7c65
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -3,7 +3,7 @@ jdk: oraclejdk8
scala: scala:
- 2.11.12 - 2.11.12
- 2.12.6 - 2.12.7
script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
++$TRAVIS_SCALA_VERSION ++$TRAVIS_SCALA_VERSION
@ -14,7 +14,7 @@ script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M
matrix: matrix:
include: include:
- scala: 2.12.6 - scala: 2.12.7
jdk: openjdk11 jdk: openjdk11
- scala: 2.10.6 - scala: 2.10.6
script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION compile" script: sbt -Dfile.encoding=UTF8 -J-XX:ReservedCodeCacheSize=256M "++$TRAVIS_SCALA_VERSION compile"

2
build.sbt
View File

@ -45,7 +45,7 @@ lazy val utilRoot: Project = (project in file("."))
.settings( .settings(
inThisBuild( inThisBuild(
Seq( Seq(
git.baseVersion := "1.2.2", git.baseVersion := "1.3.0",
version := { version := {
val v = version.value val v = version.value
if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT" if (v contains "SNAPSHOT") git.baseVersion.value + "-SNAPSHOT"

3
internal/util-logging/src/main/scala/sbt/internal/util/ConsoleAppender.scala
View File

@ -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.message.{ Message, ObjectMessage, ReusableObjectMessage }
import org.apache.logging.log4j.core.{ LogEvent => XLogEvent } import org.apache.logging.log4j.core.{ LogEvent => XLogEvent }
import org.apache.logging.log4j.core.appender.AbstractAppender import org.apache.logging.log4j.core.appender.AbstractAppender
import scala.collection.immutable.StringOps
import ConsoleAppender._ import ConsoleAppender._
@ -390,7 +389,7 @@ class ConsoleAppender private[ConsoleAppender] (
message: String message: String
): Unit = ): Unit =
out.lockObject.synchronized { out.lockObject.synchronized {
new StringOps(message).lines.foreach { line => message.linesIterator.foreach { line =>
val builder = new java.lang.StringBuilder( val builder = new java.lang.StringBuilder(
labelColor.length + label.length + messageColor.length + line.length + reset.length * 3 + 3) 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) def fmted(a: String, b: String) = builder.append(reset).append(a).append(b).append(reset)

2
project/Dependencies.scala
View File

@ -5,7 +5,7 @@ import sbt.contraband.ContrabandPlugin.autoImport._
object Dependencies { object Dependencies {
val scala210 = "2.10.7" val scala210 = "2.10.7"
val scala211 = "2.11.12" val scala211 = "2.11.12"
val scala212 = "2.12.6" val scala212 = "2.12.7"
private val ioVersion = "1.2.1" private val ioVersion = "1.2.1"