Bump iglu-core-circe to 1.0.0 (close #98)

snowplow · May 14, 2020 · 6504cde · 6504cde
1 parent 9cad7e2
commit 6504cde
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/build.sbt b/build.sbt
@@ -18,7 +18,7 @@ lazy val root = project.in(file("."))
     version            := "1.0.0",
     description        := "Scala analytics SDK for Snowplow",
     scalaVersion       := "2.12.8",
-    crossScalaVersions := Seq("2.11.12", "2.12.8")
+    crossScalaVersions := Seq("2.12.8")
   ))
   .enablePlugins(SiteScaladocPlugin)
   .enablePlugins(GhpagesPlugin)
@@ -38,7 +38,6 @@ lazy val root = project.in(file("."))
       Dependencies.cats,
       Dependencies.circeParser,
       Dependencies.circeGeneric,
-      Dependencies.circeJava,
       Dependencies.s3,
       Dependencies.dynamodb,
       // Scala (test only)

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -15,9 +15,9 @@ import sbt._
 object Dependencies {
 
   object V {
-    val igluCore       = "0.5.1"
-    val cats           = "1.6.0"
-    val circe          = "0.11.1"
+    val igluCore       = "1.0.0"
+    val cats           = "2.1.1"
+    val circe          = "0.13.0"
     val aws            = "1.11.490"
     // Scala (test only)
     val specs2         = "4.4.1"
@@ -27,7 +27,6 @@ object Dependencies {
   val cats             = "org.typelevel"              %% "cats-core"            % V.cats
   val circeParser      = "io.circe"                   %% "circe-parser"         % V.circe
   val circeGeneric     = "io.circe"                   %% "circe-generic"        % V.circe
-  val circeJava        = "io.circe"                   %% "circe-java8"          % V.circe
   val s3               = "com.amazonaws"              % "aws-java-sdk-s3"       % V.aws
   val dynamodb         = "com.amazonaws"              % "aws-java-sdk-dynamodb" % V.aws
   // Scala (test only)

diff --git a/src/main/scala/com.snowplowanalytics.snowplow.analytics.scalasdk/Event.scala b/src/main/scala/com.snowplowanalytics.snowplow.analytics.scalasdk/Event.scala
@@ -17,15 +17,14 @@ import java.time.Instant
 import java.util.UUID
 
 // circe
-import io.circe.{Encoder, Json, JsonObject, ObjectEncoder, Decoder}
+import io.circe.{Encoder, Json, JsonObject, Decoder}
 import io.circe.Json.JString
 import io.circe.generic.semiauto._
 import io.circe.syntax._
-import io.circe.java8.time._
 
 // iglu
 import com.snowplowanalytics.iglu.core.SelfDescribingData
-import com.snowplowanalytics.iglu.core.circe.instances._
+import com.snowplowanalytics.iglu.core.circe.implicits._
 
 // This library
 import com.snowplowanalytics.snowplow.analytics.scalasdk.decode.{Parser, DecodeResult}
@@ -239,7 +238,7 @@ object Event {
   /**
     * Automatically derived Circe encoder
     */
-  implicit val jsonEncoder: ObjectEncoder[Event] = deriveEncoder[Event]
+  implicit val jsonEncoder: Encoder.AsObject[Event] = deriveEncoder[Event]
 
   implicit def eventDecoder: Decoder[Event] = deriveDecoder[Event]
 
@@ -270,4 +269,4 @@ object Event {
       None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
       None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None, None,
       Contexts(Nil), None, None, None, None, None, None, None, None)
-}
+}
diff --git a/src/main/scala/com.snowplowanalytics.snowplow.analytics.scalasdk/decode/ValueDecoder.scala b/src/main/scala/com.snowplowanalytics.snowplow.analytics.scalasdk/decode/ValueDecoder.scala
@@ -25,7 +25,7 @@ import cats.syntax.show._
 
 // iglu
 import com.snowplowanalytics.iglu.core.SelfDescribingData
-import com.snowplowanalytics.iglu.core.circe.instances._
+import com.snowplowanalytics.iglu.core.circe.implicits._
 
 // circe
 import io.circe.parser.{parse => parseJson}

diff --git a/src/test/scala/com.snowplowanalytics.snowplow.analytics.scalasdk/EventSpec.scala b/src/test/scala/com.snowplowanalytics.snowplow.analytics.scalasdk/EventSpec.scala
@@ -717,7 +717,7 @@ class EventSpec extends Specification {
         "event_version": "1-0-0",
         "event_fingerprint": "e3dbfa9cca0412c3d4052863cefb547f",
         "true_tstamp": "2013-11-26T00:03:57.886Z"
-      }""").right.getOrElse(throw new RuntimeException("Failed to parse expected JSON"))
+      }""").getOrElse(throw new RuntimeException("Failed to parse expected JSON"))
 
       // JSON output must be equal to output from the old transformer. (NB: field ordering in new JSON will be randomized)
       eventJson mustEqual expectedJson
@@ -1131,7 +1131,7 @@ class EventSpec extends Specification {
         "event_version": "1-0-0",
         "event_fingerprint": "e3dbfa9cca0412c3d4052863cefb547f",
         "true_tstamp": "2013-11-26T00:03:57.886Z"
-      }""").right.getOrElse(throw new RuntimeException("Failed to parse expected JSON"))
+      }""").getOrElse(throw new RuntimeException("Failed to parse expected JSON"))
 
       // JSON output must be equal to output from the old transformer. (NB: field ordering in new JSON will be randomized)
       eventJson mustEqual expectedJson
@@ -1662,7 +1662,7 @@ class EventSpec extends Specification {
         "event_version": "1-0-0",
         "event_fingerprint": "e3dbfa9cca0412c3d4052863cefb547f",
         "true_tstamp": "2013-11-26T00:03:57.886Z"
-      }""").right.getOrElse(throw new RuntimeException("Failed to parse expected JSON"))
+      }""").getOrElse(throw new RuntimeException("Failed to parse expected JSON"))
 
       // JSON output must be equal to output from the old transformer. (NB: field ordering in new JSON will be randomized)
       eventJson mustEqual expectedJson