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

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

Merge 1.1.x
This commit is contained in:
eugene yokota 2018-06-14 01:57:02 -04:00 committed by GitHub
parent 8dbe9204d3 2b52c7dea0
commit b643c98f29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build.sbt
View File

@ -1,6 +1,6 @@
import Dependencies._ import Dependencies._
import Util._ import Util._
//import com.typesafe.tools.mima.core._, ProblemFilters._ import com.typesafe.tools.mima.core._, ProblemFilters._
def internalPath = file("internal") def internalPath = file("internal")
@ -119,6 +119,11 @@ lazy val utilLogging = (project in internalPath / "util-logging")
else old(tpe) else old(tpe)
}, },
mimaSettings, mimaSettings,
mimaBinaryIssueFilters ++= Seq(
exclude[DirectMissingMethodProblem]("sbt.internal.util.SuccessEvent.copy*"),
exclude[DirectMissingMethodProblem]("sbt.internal.util.TraceEvent.copy*"),
exclude[DirectMissingMethodProblem]("sbt.internal.util.StringEvent.copy*"),
),
) )
.configure(addSbtIO) .configure(addSbtIO)

2
internal/util-logging/src/main/contraband-scala/sbt/internal/util/StringEvent.scala
View File

@ -22,7 +22,7 @@ final class StringEvent private (
override def toString: String = { override def toString: String = {
"StringEvent(" + level + ", " + message + ", " + channelName + ", " + execId + ")" "StringEvent(" + level + ", " + message + ", " + channelName + ", " + execId + ")"
} }
protected[this] def copy(level: String = level, message: String = message, channelName: Option[String] = channelName, execId: Option[String] = execId): StringEvent = { private[this] def copy(level: String = level, message: String = message, channelName: Option[String] = channelName, execId: Option[String] = execId): StringEvent = {
new StringEvent(level, message, channelName, execId) new StringEvent(level, message, channelName, execId)
} }
def withLevel(level: String): StringEvent = { def withLevel(level: String): StringEvent = {

2
internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala
View File

@ -19,7 +19,7 @@ final class SuccessEvent private (
override def toString: String = { override def toString: String = {
"SuccessEvent(" + message + ")" "SuccessEvent(" + message + ")"
} }
protected[this] def copy(message: String = message): SuccessEvent = { private[this] def copy(message: String = message): SuccessEvent = {
new SuccessEvent(message) new SuccessEvent(message)
} }
def withMessage(message: String): SuccessEvent = { def withMessage(message: String): SuccessEvent = {

2
internal/util-logging/src/main/contraband-scala/sbt/internal/util/TraceEvent.scala
View File

@ -22,7 +22,7 @@ final class TraceEvent private (
override def toString: String = { override def toString: String = {
"TraceEvent(" + level + ", " + message + ", " + channelName + ", " + execId + ")" "TraceEvent(" + level + ", " + message + ", " + channelName + ", " + execId + ")"
} }
protected[this] def copy(level: String = level, message: Throwable = message, channelName: Option[String] = channelName, execId: Option[String] = execId): TraceEvent = { private[this] def copy(level: String = level, message: Throwable = message, channelName: Option[String] = channelName, execId: Option[String] = execId): TraceEvent = {
new TraceEvent(level, message, channelName, execId) new TraceEvent(level, message, channelName, execId)
} }
def withLevel(level: String): TraceEvent = { def withLevel(level: String): TraceEvent = {

7
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.4" val scala212 = "2.12.6"
private val ioVersion = "1.1.3" private val ioVersion = "1.1.3"
@ -40,9 +40,8 @@ object Dependencies {
val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value } val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value }
val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value } val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value }
val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4" % Test val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.14.0" % Test
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.1" % Test val scalaTest = "org.scalatest" %% "scalatest" % "3.0.5" % Test
val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4" val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4"
val sjsonnew = Def.setting { val sjsonnew = Def.setting {

2
project/build.properties
View File

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

4
project/plugins.sbt
View File

@ -1,3 +1,3 @@
addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.5") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.6")
addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.2") addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.4.0")
addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.9") addSbtPlugin("com.lightbend" % "sbt-whitesource" % "0.1.9")