Merge branch 'release/2.0.0'

.travis.yml

@@ -1,8 +1,8 @@
 dist: trusty
 language: scala
 scala:
-   - 2.11.12
-   - 2.12.8
+   - 2.12.11
+   - 2.13.2
 jdk:
   - oraclejdk8
 script:

CHANGELOG

@@ -1,3 +1,12 @@
+Version 2.0.0 (2020-06-09)
+--------------------------
+Remove run manifest (#102)
+Add Scala 2.13 support (#101)
+Bump sbt-scoverage to 1.6.1 (#104)
+Bump Scala to 2.12.11 (#100)
+Bump sbt to 1.3.10 (#99)
+Bump iglu-core-circe to 1.0.0 (#98)
+
 Version 1.0.0 (2019-11-06)
 --------------------------
 Make parsing errors type-safe (#75)
@@ -49,7 +58,7 @@ Add Scala 2.12 support (#41)
 Bump json4s to 3.2.11 (#46)
 Bump aws-java-sdk to 1.11.289 (#48)
 Bump Scala 2.11 to 2.11.12 (#47)
-Bump SBT to 1.1.1 (close #49)
+Bump SBT to 1.1.1 (#49)
 Extend copyright notice to 2018 (#51)
 Change se_value to Double (#52)
 

README.md

@@ -34,7 +34,7 @@ limitations under the License.
 [license-image]: http://img.shields.io/badge/license-Apache--2-blue.svg?style=flat
 [license]: http://www.apache.org/licenses/LICENSE-2.0
 
-[release-image]: http://img.shields.io/badge/release-1.0.0-blue.svg?style=flat
+[release-image]: http://img.shields.io/badge/release-2.0.0-blue.svg?style=flat
 [releases]: https://github.com/snowplow/snowplow-scala-analytics-sdk/releases
 
 [setup-guide]: https://github.com/snowplow/snowplow/wiki/Scala-Analytics-SDK-setup

build.sbt

@@ -15,10 +15,10 @@ lazy val root = project.in(file("."))
   .settings(Seq[Setting[_]](
     name               := "snowplow-scala-analytics-sdk",
     organization       := "com.snowplowanalytics",
-    version            := "1.0.0",
+    version            := "2.0.0",
     description        := "Scala analytics SDK for Snowplow",
-    scalaVersion       := "2.12.8",
-    crossScalaVersions := Seq("2.11.12", "2.12.8")
+    scalaVersion       := "2.13.2",
+    crossScalaVersions := Seq("2.12.11", "2.13.2")
   ))
   .enablePlugins(SiteScaladocPlugin)
   .enablePlugins(GhpagesPlugin)
@@ -38,9 +38,6 @@ lazy val root = project.in(file("."))
       Dependencies.cats,
       Dependencies.circeParser,
       Dependencies.circeGeneric,
-      Dependencies.circeJava,
-      Dependencies.s3,
-      Dependencies.dynamodb,
       // Scala (test only)
       Dependencies.specs2
     )

project/BuildSettings.scala

@@ -42,12 +42,8 @@ object BuildSettings {
       "-feature",
       "-unchecked",
       "-Ywarn-dead-code",
-      "-Ywarn-inaccessible",
-      "-Ywarn-nullary-override",
-      "-Ywarn-nullary-unit",
       "-Ywarn-numeric-widen",
-      "-Ywarn-value-discard",
-      "-Ypartial-unification"
+      "-Ywarn-value-discard"
     )
   )
 

project/Dependencies.scala

@@ -15,21 +15,17 @@ import sbt._
 object Dependencies {
 
   object V {
-    val igluCore       = "0.5.1"
-    val cats           = "1.6.0"
-    val circe          = "0.11.1"
-    val aws            = "1.11.490"
+    val igluCore       = "1.0.0"
+    val cats           = "2.1.1"
+    val circe          = "0.13.0"
     // Scala (test only)
-    val specs2         = "4.4.1"
+    val specs2         = "4.8.0"
   }
 
   val igluCore         = "com.snowplowanalytics"      %% "iglu-core-circe"      % V.igluCore
   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)
-  val specs2           = "org.specs2"                 %% "specs2-core"          % V.specs2     % "test"
+  val specs2           = "org.specs2"                 %% "specs2-core"          % V.specs2     % Test
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.10

project/plugins.sbt

@@ -1,6 +1,6 @@
 addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.3")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.5.0")
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.0")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1")
 addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
 addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")

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)
-}
+}