From f2d3cfea3f0436c5a3c18cf1f40b3db0adee4937 Mon Sep 17 00:00:00 2001 From: Jason Zaugg Date: Sun, 8 Apr 2018 14:37:51 +1000 Subject: [PATCH 1/2] Upgrade to latest sbt-houserules --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index b85b1f525..8bd11098e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ -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") From d2e59fa165a2174c48f7c6431bd3d13047015c1a Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 28 Apr 2018 00:17:03 -0400 Subject: [PATCH 2/2] Scala 2.12.6 and other dependencies sbt 1.1.4 Scala 2.12.6 ScalaCheck 1.14.0 ScalaTest 3.0.5 Contraband 0.4.0 --- build.sbt | 7 ++++++- .../contraband-scala/sbt/internal/util/StringEvent.scala | 2 +- .../contraband-scala/sbt/internal/util/SuccessEvent.scala | 2 +- .../contraband-scala/sbt/internal/util/TraceEvent.scala | 2 +- project/Dependencies.scala | 6 +++--- project/build.properties | 2 +- project/plugins.sbt | 2 +- 7 files changed, 14 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 6c557ee2d..311e96eec 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ import Dependencies._ import Util._ -//import com.typesafe.tools.mima.core._, ProblemFilters._ +import com.typesafe.tools.mima.core._, ProblemFilters._ def internalPath = file("internal") @@ -117,6 +117,11 @@ lazy val utilLogging = (project in internalPath / "util-logging") else old(tpe) }, mimaSettings, + mimaBinaryIssueFilters ++= Seq( + exclude[DirectMissingMethodProblem]("sbt.internal.util.SuccessEvent.copy*"), + exclude[DirectMissingMethodProblem]("sbt.internal.util.TraceEvent.copy*"), + exclude[DirectMissingMethodProblem]("sbt.internal.util.StringEvent.copy*"), + ), ) // Relation diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/StringEvent.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/StringEvent.scala index 83e697ec6..ef4ff4b9b 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/StringEvent.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/StringEvent.scala @@ -22,7 +22,7 @@ final class StringEvent private ( override def toString: String = { "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) } def withLevel(level: String): StringEvent = { diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala index 9fdcc8e09..6d00a7eb3 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/SuccessEvent.scala @@ -19,7 +19,7 @@ final class SuccessEvent private ( override def toString: String = { "SuccessEvent(" + message + ")" } - protected[this] def copy(message: String = message): SuccessEvent = { + private[this] def copy(message: String = message): SuccessEvent = { new SuccessEvent(message) } def withMessage(message: String): SuccessEvent = { diff --git a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/TraceEvent.scala b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/TraceEvent.scala index 7775220fc..afc7d522e 100644 --- a/internal/util-logging/src/main/contraband-scala/sbt/internal/util/TraceEvent.scala +++ b/internal/util-logging/src/main/contraband-scala/sbt/internal/util/TraceEvent.scala @@ -22,7 +22,7 @@ final class TraceEvent private ( override def toString: String = { "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) } def withLevel(level: String): TraceEvent = { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 97e4f992b..02246553a 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.4" + val scala212 = "2.12.6" private val ioVersion = "1.1.3" @@ -40,8 +40,8 @@ object Dependencies { val scalaCompiler = Def.setting { "org.scala-lang" % "scala-compiler" % scalaVersion.value } val scalaReflect = Def.setting { "org.scala-lang" % "scala-reflect" % scalaVersion.value } - val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.13.4" - val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" + val scalaCheck = "org.scalacheck" %% "scalacheck" % "1.14.0" + val scalatest = "org.scalatest" %% "scalatest" % "3.0.5" val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4" val sjsonnew = Def.setting { diff --git a/project/build.properties b/project/build.properties index 05313438a..64cf32f7f 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.1.2 +sbt.version=1.1.4 diff --git a/project/plugins.sbt b/project/plugins.sbt index 8bd11098e..d5696181d 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,2 @@ 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")