From 2822b710e1347475ee96420a4df847e0c63a1d9b Mon Sep 17 00:00:00 2001
From: skolbasov <sergey.kolbasov@zalando.fi>
Date: Tue, 22 Aug 2017 22:42:01 +0300
Subject: [PATCH] Upgrade to circe 0.9.0-M1

Update specs and some outdated code
---
 build.sbt                                                | 6 +++---
 circe/src/main/scala/io/finch/circe/Decoders.scala       | 4 ++--
 circe/src/main/scala/io/finch/circe/package.scala        | 4 ++--
 circe/src/test/scala/io/finch/circe/test/CirceSpec.scala | 2 +-
 json-test/src/main/scala/io/finch/test/JsonLaws.scala    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/build.sbt b/build.sbt
index 2367d692f..760f2a312 100644
--- a/build.sbt
+++ b/build.sbt
@@ -11,17 +11,17 @@ lazy val finagleVersion = "6.45.0"
 lazy val twitterServerVersion = "1.30.0"
 lazy val finagleOAuth2Version = "0.6.45"
 lazy val finagleHttpAuthVersion = "0.1.0"
-lazy val circeVersion = "0.8.0"
+lazy val circeVersion = "0.9.0-M1"
 lazy val circeJacksonVersion = "0.8.0"
 lazy val catbirdVersion = "0.15.0"
 lazy val shapelessVersion = "2.3.2"
-lazy val catsVersion = "0.9.0"
+lazy val catsVersion = "1.0.0-MF"
 lazy val sprayVersion = "1.3.3"
 lazy val playVersion = "2.6.0-RC2"
 lazy val jacksonVersion = "2.8.8"
 lazy val argonautVersion = "6.2"
 lazy val json4sVersion = "3.5.2"
-lazy val iterateeVersion = "0.12.0"
+lazy val iterateeVersion = "0.13.0"
 
 lazy val compilerOptions = Seq(
   "-deprecation",
diff --git a/circe/src/main/scala/io/finch/circe/Decoders.scala b/circe/src/main/scala/io/finch/circe/Decoders.scala
index 378c989d5..e4261098c 100644
--- a/circe/src/main/scala/io/finch/circe/Decoders.scala
+++ b/circe/src/main/scala/io/finch/circe/Decoders.scala
@@ -29,9 +29,9 @@ trait Decoders {
     Enumerate.instance[A, Application.Json]((enum, cs) => {
       val parsed = cs match {
         case StandardCharsets.UTF_8 =>
-          enum.map(_.asByteArray).through(byteParser[Future])
+          enum.map(_.asByteArray).through(byteStreamParser[Future])
         case _ =>
-          enum.map(_.asString(cs)).through(stringParser[Future])
+          enum.map(_.asString(cs)).through(stringStreamParser[Future])
       }
       parsed.through(decoder[Future, A])
     })
diff --git a/circe/src/main/scala/io/finch/circe/package.scala b/circe/src/main/scala/io/finch/circe/package.scala
index b1d6ba5c7..65dbab1c9 100644
--- a/circe/src/main/scala/io/finch/circe/package.scala
+++ b/circe/src/main/scala/io/finch/circe/package.scala
@@ -12,8 +12,8 @@ package object circe extends Encoders with Decoders {
   /**
    * Provides a [[Printer]] that drops null keys.
    */
-  object dropNullKeys extends Encoders with Decoders {
-    private[this] val printer: Printer = Printer.noSpaces.copy(dropNullKeys = true)
+  object dropNullValues extends Encoders with Decoders {
+    private[this] val printer: Printer = Printer.noSpaces.copy(dropNullValues = true)
     protected def print(json: Json, cs: Charset): Buf =
       Buf.ByteBuffer.Owned(printer.prettyByteBuffer(json, cs))
   }
diff --git a/circe/src/test/scala/io/finch/circe/test/CirceSpec.scala b/circe/src/test/scala/io/finch/circe/test/CirceSpec.scala
index dce74eb8b..774f100ba 100644
--- a/circe/src/test/scala/io/finch/circe/test/CirceSpec.scala
+++ b/circe/src/test/scala/io/finch/circe/test/CirceSpec.scala
@@ -15,6 +15,6 @@ class CirceJacksonSpec extends AbstractJsonSpec {
 }
 
 class CirceDropNullKeysSpec extends AbstractJsonSpec {
-  import io.finch.circe.dropNullKeys._
+  import io.finch.circe.dropNullValues._
   checkJson("circe-dropNullKeys")
 }
diff --git a/json-test/src/main/scala/io/finch/test/JsonLaws.scala b/json-test/src/main/scala/io/finch/test/JsonLaws.scala
index 9d69b4a12..96a5dc149 100644
--- a/json-test/src/main/scala/io/finch/test/JsonLaws.scala
+++ b/json-test/src/main/scala/io/finch/test/JsonLaws.scala
@@ -50,9 +50,9 @@ trait EnumerateJsonLaws[A] extends Laws with AllInstances with FutureModule {
   def enumerate: Enumerate.Json[A]
 
   def success(a: List[A], cs: Charset)(implicit e: Encoder[A], d: Decoder[A]): IsEq[Vector[A]] = {
-    val json = enumOne(Encoder.encodeList[A].apply(a).noSpaces)
+    val json = enumList(a).map(a => e(a).noSpaces).intersperse("\n")
     val enum = json.map(str => Buf.ByteArray.Owned(str.getBytes(cs.name)))
-    val toCompare = json.through(stringParser[Future]).through(decoder[Future, A])
+    val toCompare = json.through(stringStreamParser[Future]).through(decoder[Future, A])
     Await.result(enumerate(enum, cs).toVector) <-> Await.result(toCompare.toVector)
   }