Merge pull request #562 from mkurz/version_upgrade

Upgrading versions before 2.1.3 release

.travis.yml

@@ -8,8 +8,8 @@ env:
   - TRAVIS_JDK=11
 
 scala:
-  - 2.12.10
-  - 2.13.1
+  - 2.12.13
+  - 2.13.5
 
 before_install: curl -Ls https://git.io/jabba | bash && . ~/.jabba/jabba.sh
 install: jabba install "adopt@~1.$TRAVIS_JDK.0-0" && jabba use "$_" && java -Xmx32m -version

build.sbt

@@ -13,8 +13,8 @@ import scalariform.formatter.preferences._
 // Shading and Project Settings
 //---------------------------------------------------------------
 
-val scala212 = "2.12.10"
-val scala213 = "2.13.1"
+val scala212 = "2.12.13"
+val scala213 = "2.13.5"
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 resolvers in ThisBuild += Resolver.sonatypeRepo("public")

play-ahc-ws-standalone/src/main/scala/play/api/libs/ws/ahc/OrderPreserving.scala

@@ -22,9 +22,9 @@ private[ahc] object OrderPreserving {
 
     // Note that we are NOT going through m (didn't retain order) but we are iterating over the original seq
     // just to get the keys so we can look up the values in m with them. This is how order is maintained.
-    for ((k, v) <- seq.iterator) b += k -> m.getOrElse(k, Seq.newBuilder[V]).result
+    for ((k, v) <- seq.iterator) b += k -> m.getOrElse(k, Seq.newBuilder[V]).result()
 
     // Get the builder to produce the final result
-    b.result
+    b.result()
   }
 }

project/Dependencies.scala

@@ -21,7 +21,7 @@ object Dependencies {
 
   val junitInterface = Seq("com.novocode" % "junit-interface" % "0.11")
 
-  val scalaJava8Compat = Seq("org.scala-lang.modules" %% "scala-java8-compat" % "0.9.0")
+  val scalaJava8Compat = Seq("org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1")
 
   val playJsonVersion = "2.8.1"
   val playJson = Seq("com.typesafe.play" %% "play-json" % playJsonVersion)
@@ -42,7 +42,7 @@ object Dependencies {
   val cachecontrolVersion = "2.0.0"
   val cachecontrol = Seq("com.typesafe.play" %% "cachecontrol" % cachecontrolVersion)
 
-  val asyncHttpClientVersion = "2.10.4"
+  val asyncHttpClientVersion = "2.10.5"
   val asyncHttpClient = Seq("org.asynchttpclient" % "async-http-client" % asyncHttpClientVersion)
 
   val akkaVersion = "2.6.1"

project/build.properties

@@ -1,4 +1,4 @@
 #
 # Copyright (C) Lightbend Inc. <https://www.lightbend.com>
 #
-sbt.version=1.3.6
+sbt.version=1.3.13