Skip to content

Commit

Permalink
update json4s and spray-json. more Scala 2.12 support
Browse files Browse the repository at this point in the history
  • Loading branch information
xuwei-k committed Sep 26, 2016
1 parent bec46ca commit 7ed63ae
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
@@ -1,5 +1,5 @@
language: scala
scala:
- 2.11.8
jdk:
- oraclejdk8
script:
- sbt "so test"
2 changes: 0 additions & 2 deletions build.sbt
Expand Up @@ -99,7 +99,6 @@ lazy val supportArgonaut = support("argonaut")
.settings(crossScalaVersions := Seq("2.10.6", "2.11.8"))

lazy val supportJson4s = support("json4s")
.settings(crossScalaVersions := Seq("2.10.6", "2.11.8"))

lazy val supportPlay = support("play")
.settings(crossScalaVersions := Seq("2.11.8"))
Expand All @@ -111,7 +110,6 @@ lazy val supportRojomaV3 = support("rojoma-v3")
.settings(crossScalaVersions := Seq("2.10.6", "2.11.8"))

lazy val supportSpray = support("spray")
.settings(crossScalaVersions := Seq("2.10.6", "2.11.8"))

lazy val benchmark = project.in(file("benchmark"))
.dependsOn(all.map(Project.classpathDependency[Project]): _*)
Expand Down
2 changes: 1 addition & 1 deletion support/json4s/build.sbt
@@ -1,5 +1,5 @@
name := "json4s-support"

libraryDependencies ++= Seq(
"org.json4s" %% "json4s-ast" % "3.3.0"
"org.json4s" %% "json4s-ast" % "3.4.1"
)
2 changes: 1 addition & 1 deletion support/spray/build.sbt
Expand Up @@ -3,5 +3,5 @@ name := "spray-support"
resolvers += "spray" at "http://repo.spray.io/"

libraryDependencies ++= Seq(
"io.spray" %% "spray-json" % "1.3.1"
"io.spray" %% "spray-json" % "1.3.2"
)

0 comments on commit 7ed63ae

Please sign in to comment.