diff --git a/.travis.yml b/.travis.yml index deb548f..0d85049 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,16 @@ +# by default Travis uses JDK 8u31, which is much too old for Scala 2.12 (versions before 8u102 have issues - https://issues.scala-lang.org/browse/SI-9828) +# Trusty uses JDK 8u131 +dist: trusty +sudo: false + language: scala + scala: - - 2.11.7 + - 2.12.3 + - 2.11.11 + jdk: - oraclejdk8 + +script: sbt ++$TRAVIS_SCALA_VERSION clean test diff --git a/build.sbt b/build.sbt index fe53bd3..353c395 100644 --- a/build.sbt +++ b/build.sbt @@ -1,28 +1,20 @@ +import sbt.Keys.scalaVersion + name := "jwt" organization := "io.igl" version := "1.2.2" -scalaVersion := "2.12.1" -crossScalaVersions := Seq("2.11.7", "2.12.1") +scalaVersion := "2.12.3" +crossScalaVersions := Seq("2.11.11", "2.12.3") libraryDependencies ++= Seq( - playjson(scalaVersion.value), + "com.typesafe.play" %% "play-json" % "2.6.3", "commons-codec" % "commons-codec" % "1.10", - scalatest(scalaVersion.value) + "org.scalatest" %% "scalatest" % "3.0.1" % Test ) -def playjson(scalaVersion: String) = scalaVersion match { - case "2.12.1" => "com.typesafe.play" %% "play-json" % "2.6.0-M6" - case "2.11.7" => "com.typesafe.play" %% "play-json" % "2.4.0" -} - -def scalatest(scalaVersion: String) = scalaVersion match { - case "2.12.1" => "org.scalatest" % "scalatest_2.12" % "3.0.1" % "test" - case "2.11.7" => "org.scalatest" % "scalatest_2.11" % "2.2.4" % "test" -} - publishMavenStyle := true publishArtifact in Test := false diff --git a/project/build.properties b/project/build.properties new file mode 100644 index 0000000..94005e5 --- /dev/null +++ b/project/build.properties @@ -0,0 +1 @@ +sbt.version=1.0.0