Merge pull request #88 from eed3si9n/wip/contrabandbump

Contraband 0.3.0-M7, and transitive ScalaJSON

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)
 

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

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

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

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,

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] {

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._

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 = Def.setting { "com.eed3si9n" %% "sjson-new-core" % contrabandSjsonNewVersion.value }
-  val sjsonnew = "com.eed3si9n" %% "sjson-new-core" % sjsonnewVersion
+  val sjsonnewScalaJson = Def.setting { "com.eed3si9n" %% "sjson-new-scalajson" % contrabandSjsonNewVersion.value }
-  val sjsonnewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % sjsonnewVersion
 
   def log4jVersion = "2.8.1"
   val log4jApi = "org.apache.logging.log4j" % "log4j-api" % log4jVersion

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")

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 {

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 {

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
 

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 }

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 {