Merge pull request #221 from dispatch/pr-220-1.1-backport

[1.1.x] Update dependencies. enable lift-json module Scala 2.13 tests
dispatch · Oct 23, 2019 · 7190351 · 7190351
2 parents 7584472 + 8c7b5fc
commit 7190351
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 21 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,20 +5,7 @@ language: scala
 sudo: false
 scala:
   - 2.12.8
+  - 2.13.1
 jdk:
   - openjdk8
   - openjdk11
-matrix:
-  include:
-  - jdk: openjdk8
-    scala: 2.13.0
-    script:
-    # TODO lift-json for Scala 2.13
-    - sbt "++ ${TRAVIS_SCALA_VERSION}!"
-      "all json4s-jackson/test json4s-native/test jsoup/test core/test tagsoup/test"
-  - jdk: openjdk11
-    scala: 2.13.0
-    script:
-    # TODO lift-json for Scala 2.13
-    - sbt "++ ${TRAVIS_SCALA_VERSION}!"
-      "all json4s-jackson/test json4s-native/test jsoup/test core/test tagsoup/test"
diff --git a/core/build.sbt b/core/build.sbt
@@ -4,7 +4,7 @@ description :=
   "Core Dispatch module wrapping async-http-client"
 
 libraryDependencies +=
-  "org.asynchttpclient" % "async-http-client" % "2.10.1"
+  "org.asynchttpclient" % "async-http-client" % "2.10.4"
 
 enablePlugins(BuildInfoPlugin)
 

diff --git a/json4sjackson/build.sbt b/json4sjackson/build.sbt
@@ -5,5 +5,5 @@ description :=
 
 libraryDependencies ++= Seq(
   "org.json4s" %% "json4s-jackson" % "3.6.7",
-  "ws.unfiltered" %% "unfiltered-netty-server" % "0.10.0-M4" % "test"
+  "ws.unfiltered" %% "unfiltered-netty-server" % "0.10.0-M5" % "test"
 )
diff --git a/json4snative/build.sbt b/json4snative/build.sbt
@@ -8,5 +8,5 @@ val json4sVersion = "3.6.7"
 libraryDependencies ++= Seq(
   "org.json4s" %% "json4s-core" % json4sVersion,
   "org.json4s" %% "json4s-native" % json4sVersion,
-  "ws.unfiltered" %% "unfiltered-netty-server" % "0.10.0-M4" % "test"
+  "ws.unfiltered" %% "unfiltered-netty-server" % "0.10.0-M5" % "test"
 )
diff --git a/liftjson/build.sbt b/liftjson/build.sbt
@@ -6,6 +6,6 @@ description :=
 scalacOptions += "-Xfatal-warnings"
 
 libraryDependencies ++= Seq(
-  "net.liftweb" %% "lift-json" % "3.3.0",
-  "org.mockito" % "mockito-core" % "3.0.0" % "test"
+  "net.liftweb" %% "lift-json" % "3.4.0",
+  "org.mockito" % "mockito-core" % "3.1.0" % "test"
 )
diff --git a/project/build.properties b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.2.8
+sbt.version=1.3.3
diff --git a/ufcheck/build.sbt b/ufcheck/build.sbt
@@ -1,5 +1,5 @@
 libraryDependencies ++= Seq(
   "org.scalacheck" %% "scalacheck" % "1.14.0" % "test",
-  "ws.unfiltered" %% "unfiltered-netty-server" % "0.10.0-M4" % "test",
+  "ws.unfiltered" %% "unfiltered-netty-server" % "0.10.0-M5" % "test",
   "org.slf4j" % "slf4j-simple" % "1.7.26" % "test"
 )