From 4e01a359177f6fb844e9b392909d3f69ea597905 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 1 Jul 2017 07:47:19 -0400 Subject: [PATCH 1/3] Contraband update --- build.sbt | 6 +++--- .../src/main/scala/sbt/internal/util/ObjectEvent.scala | 2 +- .../main/scala/sbt/internal/util/codec/JValueFormats.scala | 2 +- project/Dependencies.scala | 6 +++--- project/plugins.sbt | 2 +- util-cache/src/main/scala/sbt/util/CacheStore.scala | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index 1b77cc349..5f53fdb2c 100644 --- a/build.sbt +++ b/build.sbt @@ -83,7 +83,7 @@ lazy val utilCollection = (project in internalPath / "util-collection"). crossScalaVersions := Seq(scala210, scala211, scala212), Util.keywordsSettings, name := "Util Collection", - libraryDependencies ++= Seq(sjsonnew) + libraryDependencies ++= Seq(sjsonnew.value) ) lazy val utilApplyMacro = (project in internalPath / "util-appmacro"). @@ -112,7 +112,7 @@ lazy val utilLogging = (project in internalPath / "util-logging"). commonSettings, crossScalaVersions := Seq(scala210, scala211, scala212), name := "Util Logging", - libraryDependencies ++= Seq(jline, log4jApi, log4jCore, disruptor, sjsonnewScalaJson, scalaReflect.value), + libraryDependencies ++= Seq(jline, log4jApi, log4jCore, disruptor, sjsonnewScalaJson.value, scalaReflect.value), sourceManaged in (Compile, generateContrabands) := baseDirectory.value / "src" / "main" / "contraband-scala", contrabandFormatsForType in generateContrabands in Compile := { tpe => val old = (contrabandFormatsForType in generateContrabands in Compile).value @@ -144,7 +144,7 @@ lazy val utilCache = (project in file("util-cache")). settings( commonSettings, name := "Util Cache", - libraryDependencies ++= Seq(sjsonnewScalaJson, scalaReflect.value) + libraryDependencies ++= Seq(sjsonnewScalaJson.value, scalaReflect.value) ). configure(addSbtIO) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ObjectEvent.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ObjectEvent.scala index c75e09a1e..674e74673 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ObjectEvent.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ObjectEvent.scala @@ -5,7 +5,7 @@ package util import sbt.util.Level import sjsonnew.JsonFormat import sjsonnew.support.scalajson.unsafe.Converter -import scala.json.ast.unsafe.JValue +import scalajson.ast.unsafe.JValue final class ObjectEvent[A]( val level: Level.Value, diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala b/internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala index c3ce6299b..e800bcff0 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/codec/JValueFormats.scala @@ -7,7 +7,7 @@ package internal package util.codec import sjsonnew.{ JsonWriter => JW, JsonReader => JR, JsonFormat => JF, _ } -import scala.json.ast.unsafe._ +import scalajson.ast.unsafe._ trait JValueFormats { self: sjsonnew.BasicJsonProtocol => implicit val JNullFormat: JF[JNull.type] = new JF[JNull.type] { diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 2c52bb55b..79c777367 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -1,5 +1,6 @@ import sbt._ import Keys._ +import sbt.contraband.ContrabandPlugin.autoImport._ object Dependencies { val scala210 = "2.10.6" @@ -43,9 +44,8 @@ object Dependencies { val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4" - val sjsonnewVersion = "0.8.0-M1" - val sjsonnew = "com.eed3si9n" %% "sjson-new-core" % sjsonnewVersion - val sjsonnewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % sjsonnewVersion + val sjsonnew = Def.setting { "com.eed3si9n" %% "sjson-new-core" % contrabandSjsonNewVersion.value } + val sjsonnewScalaJson = Def.setting { "com.eed3si9n" %% "sjson-new-scalajson" % contrabandSjsonNewVersion.value } def log4jVersion = "2.8.1" val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion diff --git a/project/plugins.sbt b/project/plugins.sbt index 1af048fe4..396603956 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,4 @@ addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.4.0") addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0-M1") addSbtPlugin("org.scala-sbt" % "sbt-houserules" % "0.3.3") -addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M6") +addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M7") diff --git a/util-cache/src/main/scala/sbt/util/CacheStore.scala b/util-cache/src/main/scala/sbt/util/CacheStore.scala index 073a52281..9ccac0d76 100644 --- a/util-cache/src/main/scala/sbt/util/CacheStore.scala +++ b/util-cache/src/main/scala/sbt/util/CacheStore.scala @@ -5,7 +5,7 @@ import sbt.io.syntax.fileToRichFile import sbt.io.{ IO, Using } import sjsonnew.{ IsoString, JsonReader, JsonWriter, SupportConverter } import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser } -import scala.json.ast.unsafe.JValue +import scalajson.ast.unsafe.JValue /** A `CacheStore` is used by the caching infrastructure to persist cached information. */ abstract class CacheStore extends Input with Output { From 2d777a85ee3e0faeb0d1eb100391922a226cd564 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 1 Jul 2017 07:47:39 -0400 Subject: [PATCH 2/3] clean up warnings --- .../src/main/scala/sbt/internal/util/BufferedLogger.scala | 4 ++-- .../src/main/scala/sbt/internal/util/ConsoleAppender.scala | 2 +- .../src/main/scala/sbt/internal/util/ManagedLogger.scala | 2 +- .../src/main/scala/sbt/internal/scripted/ScriptedTests.scala | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala index a8399e2b6..be24152c1 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/BufferedLogger.scala @@ -57,7 +57,7 @@ class BufferedAppender private[BufferedAppender] (name: String, delegate: Append result } catch { case e: Throwable => stopQuietly(); throw e } } - def stopQuietly() = synchronized { try { stopBuffer() } catch { case e: Exception => () } } + def stopQuietly() = synchronized { try { stopBuffer() } catch { case _: Exception => () } } /** * Flushes the buffer to the delegate logger. This method calls logAll on the delegate @@ -104,7 +104,7 @@ class BufferedLogger(delegate: AbstractLogger) extends BasicLogger { result } catch { case e: Throwable => stopQuietly(); throw e } } - def stopQuietly() = synchronized { try { stop() } catch { case e: Exception => () } } + def stopQuietly() = synchronized { try { stop() } catch { case _: Exception => () } } /** * Flushes the buffer to the delegate logger. This method calls logAll on the delegate 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 d730df112..e85f70fa8 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 @@ -162,7 +162,7 @@ object ConsoleAppender { terminal.restore // #460 terminal.isAnsiSupported } catch { - case e: Exception => !isWindows + case _: Exception => !isWindows // sbt 0.13 drops JLine 1.0 from the launcher and uses 2.x as a normal dependency // when 0.13 is used with a 0.12 launcher or earlier, the JLine classes from the launcher get loaded diff --git a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala index c66ceb4d2..794107111 100644 --- a/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala +++ b/internal/util-logging/src/main/scala/sbt/internal/util/ManagedLogger.scala @@ -1,7 +1,7 @@ package sbt.internal.util import sbt.util._ -import org.apache.logging.log4j.{ Logger => XLogger, Level => XLevel } +import org.apache.logging.log4j.{ Logger => XLogger } import org.apache.logging.log4j.message.ObjectMessage import sjsonnew.JsonFormat import scala.reflect.runtime.universe.TypeTag diff --git a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala index 81a04721a..fb1ba9eca 100644 --- a/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala +++ b/internal/util-scripted/src/main/scala/sbt/internal/scripted/ScriptedTests.scala @@ -4,7 +4,7 @@ package scripted import java.io.File import sbt.util.{ Logger, LogExchange, Level } -import sbt.internal.util.{ ManagedLogger, ConsoleOut, MainAppender, ConsoleAppender, BufferedAppender } +import sbt.internal.util.{ ManagedLogger, ConsoleAppender, BufferedAppender } import sbt.io.IO.wrapNull import sbt.io.{ DirectoryFilter, HiddenFileFilter } import sbt.io.syntax._ From b912a5812535fd321a918a9d3a609eb576b65b07 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Sat, 1 Jul 2017 08:00:19 -0400 Subject: [PATCH 3/3] Fix tests --- util-cache/src/test/scala/CacheSpec.scala | 2 +- util-cache/src/test/scala/FileInfoSpec.scala | 2 +- util-cache/src/test/scala/HListFormatSpec.scala | 2 +- util-cache/src/test/scala/SingletonCacheSpec.scala | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/util-cache/src/test/scala/CacheSpec.scala b/util-cache/src/test/scala/CacheSpec.scala index 109fd1247..bce7b9af1 100644 --- a/util-cache/src/test/scala/CacheSpec.scala +++ b/util-cache/src/test/scala/CacheSpec.scala @@ -8,7 +8,7 @@ import CacheImplicits._ import sjsonnew.IsoString import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser } -import scala.json.ast.unsafe.JValue +import scalajson.ast.unsafe.JValue import sbt.internal.util.UnitSpec class CacheSpec extends UnitSpec { diff --git a/util-cache/src/test/scala/FileInfoSpec.scala b/util-cache/src/test/scala/FileInfoSpec.scala index cae8e15b1..813e85371 100644 --- a/util-cache/src/test/scala/FileInfoSpec.scala +++ b/util-cache/src/test/scala/FileInfoSpec.scala @@ -1,6 +1,6 @@ package sbt.util -import scala.json.ast.unsafe._ +import scalajson.ast.unsafe._ import sjsonnew._, support.scalajson.unsafe._ import sbt.internal.util.UnitSpec diff --git a/util-cache/src/test/scala/HListFormatSpec.scala b/util-cache/src/test/scala/HListFormatSpec.scala index e2d5d38fa..a0922d02f 100644 --- a/util-cache/src/test/scala/HListFormatSpec.scala +++ b/util-cache/src/test/scala/HListFormatSpec.scala @@ -1,6 +1,6 @@ package sbt.util -import scala.json.ast.unsafe._ +import scalajson.ast.unsafe._ import sjsonnew._, support.scalajson.unsafe._ import CacheImplicits._ import sbt.internal.util.{ UnitSpec, HNil } diff --git a/util-cache/src/test/scala/SingletonCacheSpec.scala b/util-cache/src/test/scala/SingletonCacheSpec.scala index 5956746de..15265f312 100644 --- a/util-cache/src/test/scala/SingletonCacheSpec.scala +++ b/util-cache/src/test/scala/SingletonCacheSpec.scala @@ -8,7 +8,7 @@ import CacheImplicits._ import sjsonnew.{ Builder, deserializationError, IsoString, JsonFormat, Unbuilder } import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser } -import scala.json.ast.unsafe.JValue +import scalajson.ast.unsafe.JValue import sbt.internal.util.UnitSpec class SingletonCacheSpec extends UnitSpec {