diff --git a/internal/util-cache/src/test/scala/CacheSpec.scala b/internal/util-cache/src/test/scala/CacheSpec.scala index 7b9924b6e..a3b0dd5e1 100644 --- a/internal/util-cache/src/test/scala/CacheSpec.scala +++ b/internal/util-cache/src/test/scala/CacheSpec.scala @@ -6,13 +6,13 @@ import sbt.io.syntax._ import CacheImplicits._ import sjsonnew.IsoString -import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, FixedParser } +import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser } import scala.json.ast.unsafe.JValue class CacheSpec extends UnitSpec { - implicit val isoString: IsoString[JValue] = IsoString.iso(CompactPrinter.apply, FixedParser.parseUnsafe) + implicit val isoString: IsoString[JValue] = IsoString.iso(CompactPrinter.apply, Parser.parseUnsafe) "A cache" should "NOT throw an exception if read without being written previously" in { testCache[String, Int] { diff --git a/internal/util-cache/src/test/scala/SingletonCacheSpec.scala b/internal/util-cache/src/test/scala/SingletonCacheSpec.scala index 42c774a2f..da883d446 100644 --- a/internal/util-cache/src/test/scala/SingletonCacheSpec.scala +++ b/internal/util-cache/src/test/scala/SingletonCacheSpec.scala @@ -6,7 +6,7 @@ import sbt.io.syntax._ import CacheImplicits._ import sjsonnew.{ Builder, deserializationError, IsoString, JsonFormat, Unbuilder } -import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, FixedParser } +import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser } import scala.json.ast.unsafe.JValue @@ -41,7 +41,7 @@ class SingletonCacheSpec extends UnitSpec { } } - implicit val isoString: IsoString[JValue] = IsoString.iso(CompactPrinter.apply, FixedParser.parseUnsafe) + implicit val isoString: IsoString[JValue] = IsoString.iso(CompactPrinter.apply, Parser.parseUnsafe) "A singleton cache" should "throw an exception if read without being written previously" in { testCache[Int] { diff --git a/internal/util-cache/src/test/scala/sjsonnew/support/scalajson/unsafe/FixedParser.scala b/internal/util-cache/src/test/scala/sjsonnew/support/scalajson/unsafe/FixedParser.scala deleted file mode 100644 index 7f9f759dc..000000000 --- a/internal/util-cache/src/test/scala/sjsonnew/support/scalajson/unsafe/FixedParser.scala +++ /dev/null @@ -1,29 +0,0 @@ -package sjsonnew -package support.scalajson.unsafe - -import scala.json.ast.unsafe._ -import scala.collection.mutable -import jawn.{ SupportParser, MutableFacade } - -object FixedParser extends SupportParser[JValue] { - implicit val facade: MutableFacade[JValue] = - new MutableFacade[JValue] { - def jnull() = JNull - def jfalse() = JTrue - def jtrue() = JFalse - def jnum(s: String) = JNumber(s) - def jint(s: String) = JNumber(s) - def jstring(s: String) = JString(s) - def jarray(vs: mutable.ArrayBuffer[JValue]) = JArray(vs.toArray) - def jobject(vs: mutable.Map[String, JValue]) = { - val array = new Array[JField](vs.size) - var i = 0 - vs.foreach { - case (key, value) => - array(i) = JField(key, value) - i += 1 - } - JObject(array) - } - } -} \ No newline at end of file diff --git a/internal/util-tracking/src/test/scala/sbt/internal/util/TrackedSpec.scala b/internal/util-tracking/src/test/scala/sbt/internal/util/TrackedSpec.scala index 3c38a2c4a..df23ae8e7 100644 --- a/internal/util-tracking/src/test/scala/sbt/internal/util/TrackedSpec.scala +++ b/internal/util-tracking/src/test/scala/sbt/internal/util/TrackedSpec.scala @@ -6,13 +6,13 @@ import sbt.io.syntax._ import CacheImplicits._ import sjsonnew.IsoString -import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, FixedParser } +import sjsonnew.support.scalajson.unsafe.{ CompactPrinter, Converter, Parser } import scala.json.ast.unsafe.JValue class TrackedSpec extends UnitSpec { - implicit val isoString: IsoString[JValue] = IsoString.iso(CompactPrinter.apply, FixedParser.parseUnsafe) + implicit val isoString: IsoString[JValue] = IsoString.iso(CompactPrinter.apply, Parser.parseUnsafe) "lastOutput" should "store the last output" in { withStore { store => diff --git a/internal/util-tracking/src/test/scala/sjsonnew/support/scalajson/unsafe/FixedParser.scala b/internal/util-tracking/src/test/scala/sjsonnew/support/scalajson/unsafe/FixedParser.scala deleted file mode 100644 index 7f9f759dc..000000000 --- a/internal/util-tracking/src/test/scala/sjsonnew/support/scalajson/unsafe/FixedParser.scala +++ /dev/null @@ -1,29 +0,0 @@ -package sjsonnew -package support.scalajson.unsafe - -import scala.json.ast.unsafe._ -import scala.collection.mutable -import jawn.{ SupportParser, MutableFacade } - -object FixedParser extends SupportParser[JValue] { - implicit val facade: MutableFacade[JValue] = - new MutableFacade[JValue] { - def jnull() = JNull - def jfalse() = JTrue - def jtrue() = JFalse - def jnum(s: String) = JNumber(s) - def jint(s: String) = JNumber(s) - def jstring(s: String) = JString(s) - def jarray(vs: mutable.ArrayBuffer[JValue]) = JArray(vs.toArray) - def jobject(vs: mutable.Map[String, JValue]) = { - val array = new Array[JField](vs.size) - var i = 0 - vs.foreach { - case (key, value) => - array(i) = JField(key, value) - i += 1 - } - JObject(array) - } - } -} \ No newline at end of file diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 8be45ba91..18e4189c4 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -26,7 +26,7 @@ object Dependencies { lazy val parserCombinator211 = "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.4" - lazy val sjsonnewVersion = "0.4.1" + lazy val sjsonnewVersion = "0.4.2" lazy val sjsonnew = "com.eed3si9n" %% "sjson-new-core" % sjsonnewVersion lazy val sjsonnewScalaJson = "com.eed3si9n" %% "sjson-new-scalajson" % sjsonnewVersion }