Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Added support for Scala 2.12
  • Loading branch information
DanielaSfregola committed Dec 13, 2016
1 parent ddfcccb commit 67fe5c4
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -2,6 +2,7 @@ language: scala
scala:
- "2.10.4"
- "2.11.7"
- "2.12.1"
cache:
directories:
- $HOME/.ivy2
10 changes: 5 additions & 5 deletions build.sbt
Expand Up @@ -2,19 +2,19 @@ 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

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")
Expand Down
2 changes: 2 additions & 0 deletions project/plugins.sbt
Expand Up @@ -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")

1 change: 0 additions & 1 deletion 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

Expand Down
1 change: 0 additions & 1 deletion src/test/scala/authentikat/jwt/JsonWebSignatureSpec.scala
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion 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
Expand Down

0 comments on commit 67fe5c4

Please sign in to comment.