Merge pull request alexarchambault#3 from alexarchambault/topic/circe-0.6

Switch to circe 0.6

Author: alexarchambault

build.sbt

@@ -1,6 +1,6 @@
 
 val jupyterScalaVersion = "0.3.0-M3"
-val circeVersion = "0.4.1"
+val circeVersion = "0.6.1"
 val plotlyVersion = "1.12.0"
 
 lazy val core = crossProject
@@ -27,11 +27,11 @@ lazy val `circe-alt-generic` = crossProject
   .settings(
     name := "circe-alt-generic",
     libraryDependencies ++= Seq(
-      "io.circe" %%% "circe-core" % "0.4.1",
-      "io.circe" %%% "circe-parser" % "0.4.1",
-      "com.chuusai" %%% "shapeless" % "2.3.1",
-      "com.github.alexarchambault" %%% "scalacheck-shapeless_1.13" % "1.1.0-RC3" % "test",
-      "com.lihaoyi" %%% "utest" % "0.3.0" % "test"
+      "io.circe" %%% "circe-core" % circeVersion,
+      "io.circe" %%% "circe-parser" % circeVersion,
+      "com.chuusai" %%% "shapeless" % "2.3.2",
+      "com.github.alexarchambault" %%% "scalacheck-shapeless_1.13" % "1.1.4" % "test",
+      "com.lihaoyi" %%% "utest" % "0.4.4" % "test"
     ),
     testFrameworks += new TestFramework("utest.runner.Framework")
   )
@@ -58,7 +58,7 @@ lazy val render = crossProject
   .jsSettings(
     libraryDependencies ++= Seq(
       "io.circe" %%% "circe-scalajs" % circeVersion,
-      "org.scala-js" %%% "scalajs-dom" % "0.9.0"
+      "org.scala-js" %%% "scalajs-dom" % "0.9.1"
     )
   )
 
@@ -75,7 +75,7 @@ lazy val demo = project
     test in Test := (),
     testOnly in Test := (),
     libraryDependencies ++= Seq(
-      "com.lihaoyi" %%% "scalatags" % "0.5.5"
+      "com.lihaoyi" %%% "scalatags" % "0.6.2"
     ),
     jsDependencies ++= Seq(
       ("org.webjars.bower" % "plotly.js" % plotlyVersion intransitive()) / "plotly.min.js" commonJSName "Plotly",
@@ -173,7 +173,7 @@ lazy val tests = project
     name := "plotly-tests",
     libraryDependencies ++= Seq(
       "io.circe" %% "circe-literal" % circeVersion % "test",
-      "org.scalatest" %% "scalatest" % "3.0.0-M11" % "test",
+      "org.scalatest" %% "scalatest" % "3.0.1" % "test",
       "org.mozilla" % "rhino" % "1.7.7.1" % "test"
     )
   )

circe-alt-generic/shared/src/main/scala/io/circe/altgeneric/derive/JsonProductCodec.scala

@@ -1,7 +1,6 @@
 package io.circe.altgeneric
 package derive
 
-import cats.data.Xor
 import io.circe.{ ACursor, Decoder, HCursor, Json }
 
 abstract class JsonProductCodec {
@@ -46,18 +45,18 @@ class JsonProductObjCodec extends JsonProductCodec {
       obj.mapObject((toJsonName(name) -> content) +: _)
   }
 
-  def decodeEmpty(cursor: HCursor): Decoder.Result[Unit] = Xor.right(())
+  def decodeEmpty(cursor: HCursor): Decoder.Result[Unit] = Right(())
   def decodeField[A](name: String, cursor: HCursor, decode: Decoder[A], default: Option[A]): Decoder.Result[(A, ACursor)] = {
     val c = cursor.downField(toJsonName(name))
-    def result = c.as(decode).map((_, ACursor.ok(cursor)))
+    def result = c.as(decode).right.map((_, ACursor.ok(cursor)))
 
     default match {
       case None => result
       case Some(d) =>
         if (c.succeeded)
           result
         else
-          Xor.right((d, ACursor.ok(cursor)))
+          Right((d, ACursor.ok(cursor)))
     }
   }
 }

circe-alt-generic/shared/src/main/scala/io/circe/altgeneric/derive/JsonSumCodec.scala

@@ -1,7 +1,6 @@
 package io.circe.altgeneric
 package derive
 
-import cats.data.Xor
 import io.circe._
 
 abstract class JsonSumCodec {
@@ -45,16 +44,16 @@ class JsonSumObjCodec extends JsonSumCodec {
     }
 
   def decodeEmpty(cursor: HCursor): Decoder.Result[Nothing] =
-    Xor.left(DecodingFailure(
+    Left(DecodingFailure(
       s"unrecognized type(s): ${cursor.fields.getOrElse(Nil).mkString(", ")}",
       cursor.history
     ))
   def decodeField[A](name: String, cursor: HCursor, decode: Decoder[A]): Decoder.Result[Either[ACursor, A]] =
     cursor.downField(toJsonName(name)).either match {
-      case Xor.Left(_) =>
-        Xor.right(Left(ACursor.ok(cursor)))
-      case Xor.Right(content) =>
-        decode(content).map(Right(_))
+      case Left(_) =>
+        Right(Left(ACursor.ok(cursor)))
+      case Right(content) =>
+        decode(content).right.map(Right(_))
     }
 }
 
@@ -74,18 +73,21 @@ class JsonSumTypeFieldCodec extends JsonSumCodec {
     }
 
   def decodeEmpty(cursor: HCursor): Decoder.Result[Nothing] =
-    Xor.Left(DecodingFailure(
+    Left(DecodingFailure(
       cursor.downField(typeField).focus match {
         case None => "no type found"
         case Some(type0) => s"unrecognized type: $type0"
       },
       cursor.history
     ))
-  def decodeField[A](name: String, cursor: HCursor, decode: Decoder[A]): Decoder.Result[Either[ACursor, A]] =
-    cursor.downField(typeField).as[String] match {
-      case Xor.Right(name0) if toTypeValue(name) == name0 =>
-        decode(cursor).map(Right(_))
+  def decodeField[A](name: String, cursor: HCursor, decode: Decoder[A]): Decoder.Result[Either[ACursor, A]] = {
+    val c = cursor.downField(typeField)
+
+    c.as[String] match {
+      case Right(name0) if toTypeValue(name) == name0 =>
+        c.delete.as(decode).right.map(Right(_))
       case _ =>
-        Xor.Right(Left(ACursor.ok(cursor)))
+        Right(Left(ACursor.ok(cursor)))
     }
+  }
 }

circe-alt-generic/shared/src/main/scala/io/circe/altgeneric/derive/MkDecoder.scala

@@ -1,7 +1,6 @@
 package io.circe.altgeneric
 package derive
 
-import cats.data.Xor
 import shapeless._
 import shapeless.labelled.{FieldType, field}
 import io.circe.Decoder
@@ -85,6 +84,7 @@ object HListProductDecoder {
       Decoder.instance { c =>
         productCodec
           .decodeEmpty(c)
+          .right
           .map(_ => HNil)
       }
     }
@@ -100,10 +100,9 @@ object HListProductDecoder {
 
       Decoder.instance { c =>
         for {
-          x <- productCodec.decodeField(key.value.name, c, headDecode.value, defaults.head)
-          (h, remaining) = x
-          t <- remaining.as(tailDecode0)
-        } yield field[K](h) :: t
+          x <- productCodec.decodeField(key.value.name, c, headDecode.value, defaults.head).right
+          t <- x._2.as(tailDecode0).right
+        } yield field[K](x._1) :: t
       }
     }
 }
@@ -127,6 +126,7 @@ object CoproductSumDecoder {
       Decoder.instance { c =>
         sumCodec
           .decodeEmpty(c)
+          .right
           .map(t => t: CNil)
       }
     }
@@ -141,9 +141,9 @@ object CoproductSumDecoder {
       lazy val tailDecode0 = tailDecode(sumCodec)
 
       Decoder.instance { c =>
-        sumCodec.decodeField(key.value.name, c, headDecode.value).flatMap {
-          case Left(tailCursor) => tailCursor.as(tailDecode0).map(Inr(_))
-          case Right(h) => Xor.right(Inl(field[K](h)))
+        sumCodec.decodeField(key.value.name, c, headDecode.value).right.flatMap {
+          case Left(tailCursor) => tailCursor.as(tailDecode0).right.map(Inr(_))
+          case Right(h) => Right(Inl(field[K](h)))
         }
       }
     }

circe-alt-generic/shared/src/test/scala/io/circe/altgeneric/DefaultTests.scala

@@ -1,6 +1,5 @@
 package io.circe.altgeneric
 
-import cats.data.Xor
 import io.circe.{ Decoder, Encoder, Json }
 import utest._
 
@@ -34,11 +33,11 @@ object DefaultTests extends TestSuite {
       assert(json1 == expectedJson1)
 
       val result0 = decoder.decodeJson(expectedJson0)
-      val expectedResult0 = Xor.right(value0)
+      val expectedResult0 = Right(value0)
       assert(result0 == expectedResult0)
 
       val result1 = decoder.decodeJson(expectedJson1)
-      val expectedResult1 = Xor.right(value1)
+      val expectedResult1 = Right(value1)
       assert(result1 == expectedResult1)
     }
   }

circe-alt-generic/shared/src/test/scala/io/circe/altgeneric/PriorityTestsDefn.scala

@@ -10,7 +10,7 @@ object PriorityTestsDefn {
   object CC {
     implicit val decode: Decoder[CC] = new Decoder[CC] with Flag {
       def apply(c: HCursor) =
-        Decoder[(String, Int)].apply(c).map { case (s, i) =>
+        Decoder[(String, Int)].apply(c).right.map { case (s, i) =>
           CC(s, i)
         }
     }

circe-alt-generic/shared/src/test/scala/io/circe/altgeneric/ShapelessTests.scala

@@ -4,7 +4,6 @@ import org.scalacheck.{ Arbitrary, Prop }
 import shapeless.test.illTyped
 import utest._
 import Util._
-import cats.data.Xor
 import io.circe.{ Decoder, Encoder, Json, parser => Parse }
 import io.circe.syntax._
 
@@ -15,7 +14,7 @@ object ShapelessTests extends TestSuite {
   private def sameAfterBeforeSerialization[T: Arbitrary : Encoder : Decoder]: Unit =
     Prop.forAll {
       t: T =>
-        toFromJson(t) == Xor.right(t)
+        toFromJson(t) == Right(t)
     }.validate
 
   import org.scalacheck.Shapeless._
@@ -55,10 +54,10 @@ object ShapelessTests extends TestSuite {
       }
 
       'oiLoose - {
-        val json = Parse.parse("{}").toOption.get
+        val json = Parse.parse("{}").right.toOption.get
         // assert macro crashes if result is substituted by its value below
         val result = json.as[OI]
-        assert(result == Xor.right(OI(None)))
+        assert(result == Right(OI(None)))
       }
 
       'base - {

project/plugins.sbt

@@ -1,4 +1,4 @@
-addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M13")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.11")
+addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-9")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "0.6.13")
 addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.9")