Merge pull request #94 from eed3si9n/wip/bumpcontraband

Bump to latest Contraband

internal/util-logging/src/main/contraband-scala/sbt/internal/util/AbstractEntry.scala

@@ -16,7 +16,7 @@ abstract class AbstractEntry(
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (17 + "AbstractEntry".##) + channelName.##) + execId.##)
+    37 * (37 * (37 * (17 + "sbt.internal.util.AbstractEntry".##) + channelName.##) + execId.##)
   }
   override def toString: String = {
     "AbstractEntry(" + channelName + ", " + execId + ")"

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

@@ -17,7 +17,7 @@ final class StringEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (37 * (37 * (17 + "StringEvent".##) + level.##) + message.##) + channelName.##) + execId.##)
+    37 * (37 * (37 * (37 * (37 * (17 + "sbt.internal.util.StringEvent".##) + level.##) + message.##) + channelName.##) + execId.##)
   }
   override def toString: String = {
     "StringEvent(" + level + ", " + message + ", " + channelName + ", " + execId + ")"

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

@@ -17,7 +17,7 @@ final class TraceEvent private (
     case _ => false
   }
   override def hashCode: Int = {
-    37 * (37 * (37 * (37 * (37 * (17 + "TraceEvent".##) + level.##) + message.##) + channelName.##) + execId.##)
+    37 * (37 * (37 * (37 * (37 * (17 + "sbt.internal.util.TraceEvent".##) + level.##) + message.##) + channelName.##) + execId.##)
   }
   override def toString: String = {
     "TraceEvent(" + level + ", " + message + ", " + channelName + ", " + execId + ")"

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 scalajson.ast.unsafe.JValue
+import sjsonnew.shaded.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 scalajson.ast.unsafe._
+import sjsonnew.shaded.scalajson.ast.unsafe._
 
 trait JValueFormats { self: sjsonnew.BasicJsonProtocol =>
   implicit val JNullFormat: JF[JNull.type] = new JF[JNull.type] {

project/plugins.sbt

@@ -1,4 +1,6 @@
 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-M7")
+addSbtPlugin("org.scala-sbt" % "sbt-contraband" % "0.3.0-M9")
+
+resolvers += Resolver.sonatypeRepo("public")

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 scalajson.ast.unsafe.JValue
+import sjsonnew.shaded.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 scalajson.ast.unsafe.JValue
+import sjsonnew.shaded.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 scalajson.ast.unsafe._
+import sjsonnew.shaded.scalajson.ast.unsafe._
 import sjsonnew._, support.scalajson.unsafe._
 import sbt.internal.util.UnitSpec
 

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 scalajson.ast.unsafe.JValue
+import sjsonnew.shaded.scalajson.ast.unsafe.JValue
 import sbt.internal.util.UnitSpec
 
 class SingletonCacheSpec extends UnitSpec {