re-enable 2.11

meetuparchive · Jul 30, 2015 · 8b300f8 · 8b300f8
1 parent 2ec1fe7
commit 8b300f8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -4,7 +4,8 @@ before_script:
  - "export JAVA_OPTS='-Xmx512m -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M'"
 language: scala
 scala:
-  - 2.10.4
+  - 2.10.5
+  - 2.11.7
 jdk:
   - openjdk6
 cache:

diff --git a/build.sbt b/build.sbt
@@ -12,7 +12,7 @@ resolvers += "softprops-maven" at "http://dl.bintray.com/content/softprops/maven
 
 libraryDependencies ++= Seq(
   "me.lessis" %% "base64" % "0.2.0",
-  "org.json4s" %% "json4s-native" % "3.2.5",
+  "org.json4s" %% "json4s-native" % "3.2.11",
   "org.scalatest" %% "scalatest" % "2.2.1" % "test"
 )