Add support for Scala 2.12 (closes #66)

snowplow · Aug 6, 2019 · 52d9c28 · 52d9c28
1 parent 0cfc1ac
commit 52d9c28
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: scala
 scala:
    - 2.11.12
+   - 2.12.8
 jdk:
   - oraclejdk8
   - openjdk8
@@ -15,7 +16,7 @@ deploy:
   provider: script
   script: ./.travis/deploy.sh $TRAVIS_TAG
   on:
-    condition: '"${TRAVIS_SCALA_VERSION}" == "2.11.12" && "${TRAVIS_JDK_VERSION}" == "oraclejdk8"'
+    condition: '"${TRAVIS_SCALA_VERSION}" == "2.12.8" && "${TRAVIS_JDK_VERSION}" == "oraclejdk8"'
     tags: true
 env:
   global:

diff --git a/build.sbt b/build.sbt
@@ -28,10 +28,11 @@ lazy val root = (project in file("."))
       Dependencies.Libraries.jsonValidator,
       // Scala
       Dependencies.Libraries.circeParser,
-      Dependencies.Libraries.json4sJackson,
+      Dependencies.Libraries.circeOptics,
       Dependencies.Libraries.lruMap,
       Dependencies.Libraries.scalaj,
       // Scala (test only)
+      Dependencies.Libraries.circeLiteral,
       Dependencies.Libraries.specs2,
       Dependencies.Libraries.specs2Cats,
       Dependencies.Libraries.specs2Mock,

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -23,8 +23,8 @@ object BuildSettings {
 
   lazy val buildSettings = Seq[Setting[_]](
     organization  := "com.snowplowanalytics",
-    scalaVersion  := "2.11.12",
-    crossScalaVersions  := Seq("2.11.12"),
+    scalaVersion  := "2.12.8",
+    crossScalaVersions  := Seq("2.11.12", "2.12.8"),
     scalacOptions := Seq(
       "-Ypartial-unification",
       "-deprecation",

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -35,10 +35,12 @@ object Dependencies {
     val jsonValidator    = "com.networknt"              %  "json-schema-validator"   % V.jsonValidator
     // Scala
     val circeParser      = "io.circe"                   %% "circe-parser"            % V.circe
+    val circeOptics      = "io.circe"                   %% "circe-optics"            % V.circe
     val json4sJackson    = "org.json4s"                 %% "json4s-jackson"          % V.json4s
     val lruMap           = "com.snowplowanalytics"      %% "scala-lru-map"           % V.lruMap
     val scalaj           = "org.scalaj"                 %% "scalaj-http"             % V.scalaj
     // Scala (test only)
+    val circeLiteral     = "io.circe"                   %% "circe-literal"           % V.circe           % "test"
     val specs2           = "org.specs2"                 %% "specs2-core"             % V.specs2          % "test"
     val specs2Cats       = "org.specs2"                 %% "specs2-cats"             % V.specs2          % "test"
     val specs2Mock       = "org.specs2"                 %% "specs2-mock"             % V.specs2          % "test"