From 67fe5c41cfb866e14c2930a526e2b0898953e257 Mon Sep 17 00:00:00 2001
From: DanielaSfregola <daniela.sfregola@gmail.com>
Date: Tue, 13 Dec 2016 13:38:29 +0000
Subject: [PATCH] Added support for Scala 2.12

---
 .travis.yml                                            |  1 +
 build.sbt                                              | 10 +++++-----
 project/plugins.sbt                                    |  2 ++
 .../scala/authentikat/json/JsonSerializerSpec.scala    |  1 -
 .../scala/authentikat/jwt/JsonWebSignatureSpec.scala   |  1 -
 src/test/scala/authentikat/jwt/JsonWebTokenSpec.scala  |  1 -
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dea6c3f..d4ed7e1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,6 +2,7 @@ language: scala
 scala:
   - "2.10.4"
   - "2.11.7"
+  - "2.12.1"
 cache:
   directories:
   - $HOME/.ivy2
diff --git a/build.sbt b/build.sbt
index af3155b..645655b 100644
--- a/build.sbt
+++ b/build.sbt
@@ -2,9 +2,9 @@ name := "authentikat-jwt"
 
 organization := "com.jason-goodwin"
 
-scalaVersion := "2.11.7"
+scalaVersion := "2.12.1"
 
-crossScalaVersions := Seq("2.10.4", "2.11.7") //sbt '+ publish'
+crossScalaVersions := Seq("2.10.4", "2.11.7", "2.12.1") //sbt '+ publish'
 
 parallelExecution := false
 
@@ -12,9 +12,9 @@ scalacOptions ++= Seq("-unchecked", "-deprecation")
 
 libraryDependencies ++= Seq(
   "commons-codec" % "commons-codec" % "1.9",
-  "org.json4s" %% "json4s-native" % "3.4.0",
-  "org.json4s" %% "json4s-jackson" % "3.4.0",
-  "org.scalatest" %% "scalatest" % "2.2.5" % Test
+  "org.json4s" %% "json4s-native" % "3.5.0",
+  "org.json4s" %% "json4s-jackson" % "3.5.0",
+  "org.scalatest" %% "scalatest" % "3.0.1" % Test
 )
 
 credentials += Credentials(Path.userHome / ".mdialog.credentials")
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 2d7e716..37d547b 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -4,3 +4,5 @@ addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3")
 
 addSbtPlugin("commons-codec" % "commons-codec" % "1.6")
 
+addSbtPlugin("com.eed3si9n" % "sbt-doge" % "0.1.5")
+
diff --git a/src/test/scala/authentikat/json/JsonSerializerSpec.scala b/src/test/scala/authentikat/json/JsonSerializerSpec.scala
index cfde43d..d2b81bb 100644
--- a/src/test/scala/authentikat/json/JsonSerializerSpec.scala
+++ b/src/test/scala/authentikat/json/JsonSerializerSpec.scala
@@ -1,7 +1,6 @@
 package authentikat.json
 
 import org.scalatest.FunSpec
-import org.scalatest.matchers.ShouldMatchers
 import java.text.SimpleDateFormat
 import org.scalatest.Matchers
 
diff --git a/src/test/scala/authentikat/jwt/JsonWebSignatureSpec.scala b/src/test/scala/authentikat/jwt/JsonWebSignatureSpec.scala
index 41bb9cd..94093ee 100644
--- a/src/test/scala/authentikat/jwt/JsonWebSignatureSpec.scala
+++ b/src/test/scala/authentikat/jwt/JsonWebSignatureSpec.scala
@@ -2,7 +2,6 @@ package authentikat.jwt
 
 import JsonWebSignature._
 import org.scalatest.FunSpec
-import org.scalatest.matchers.ShouldMatchers
 import org.scalatest.Matchers
 
 class JsonWebSignatureSpec extends FunSpec with Matchers {
diff --git a/src/test/scala/authentikat/jwt/JsonWebTokenSpec.scala b/src/test/scala/authentikat/jwt/JsonWebTokenSpec.scala
index 50592fc..427feb0 100644
--- a/src/test/scala/authentikat/jwt/JsonWebTokenSpec.scala
+++ b/src/test/scala/authentikat/jwt/JsonWebTokenSpec.scala
@@ -1,7 +1,6 @@
 package authentikat.jwt
 
 import org.scalatest.FunSpec
-import org.scalatest.matchers.ShouldMatchers
 import java.util.{Date, TimeZone}
 import java.text.SimpleDateFormat
 import org.scalatest.Matchers