Merge pull request #356 from playframework/mergify/bp/master/pr-354

Updates - Scala 2.13 & Akka 2.6.0-M3 (bp #354)

.travis.yml

@@ -17,7 +17,7 @@ env:
 
 scala:
   - 2.12.8
-  - 2.13.0-RC2
+  - 2.13.0
 
 script:
   - sbt ++$TRAVIS_SCALA_VERSION 'testOnly -- xonly timefactor 5' mimaReportBinaryIssues validateCode doc

build.sbt

@@ -14,7 +14,7 @@ import scalariform.formatter.preferences._
 //---------------------------------------------------------------
 
 val scala212 = "2.12.8"
-val scala213 = "2.13.0-RC2"
+val scala213 = "2.13.0"
 
 resolvers ++= DefaultOptions.resolvers(snapshot = true)
 resolvers in ThisBuild += Resolver.sonatypeRepo("public")
@@ -45,13 +45,12 @@ lazy val mimaSettings = mimaDefaultSettings ++ Seq(
   mimaPreviousArtifacts := {
     val VersionPattern = """^(\d+).(\d+).(\d+)(-.*)?""".r
     val previousVersions = version.value match {
+      case VersionPattern("2", "0", "5", _) if scalaBinaryVersion.value == "2.13" => Set.empty // added 2.13.0 support in 2.0.5-SNAPSHOT.
       case VersionPattern(epoch, major, minor, _) => (0 until minor.toInt).map(v => s"$epoch.$major.$v")
       case _ => sys.error(s"Cannot find previous versions for ${version.value}")
     }
 
-    val sbv = scalaBinaryVersion.value
-    if (sbv.equals(scala213)) Set.empty
-    else previousVersions.toSet.map(previousVersion => organization.value %% name.value % previousVersion)
+    previousVersions.toSet.map(previousVersion => organization.value %% name.value % previousVersion)
   },
   mimaBinaryIssueFilters ++= Seq(
     ProblemFilters.exclude[MissingTypesProblem]("play.api.libs.ws.ahc.AhcWSClientConfig$"),
@@ -385,7 +384,7 @@ lazy val `integration-tests` = project.in(file("integration-tests"))
     fork in Test := true,
     concurrentRestrictions += Tags.limitAll(1), // only one integration test at a time
     testOptions in Test := Seq(Tests.Argument(TestFrameworks.JUnit, "-a", "-v")),
-    libraryDependencies ++= akkaHttp.value.map(_ % Test) ++ testDependencies
+    libraryDependencies ++= akkaHttp.map(_ % Test) ++ testDependencies
   )
   .settings(shadedAhcSettings)
   .settings(shadedOAuthSettings)

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

@@ -58,7 +58,7 @@ trait CurlFormat {
         val encodedPassword = Base64.getUrlEncoder.encodeToString(s"$userName:$password".getBytes(StandardCharsets.US_ASCII))
         b.append(s"""  --header 'Authorization: Basic ${quote(encodedPassword)}'""")
         b.append(" \\\n")
-      case _ =>
+      case _ => ()
     }
 
     // headers

project/Dependencies.scala

@@ -24,7 +24,7 @@ object Dependencies {
 
   val scalaJava8Compat = Seq("org.scala-lang.modules" %% "scala-java8-compat" % "0.9.0")
 
-  val playJsonVersion = "2.8.0-M1"
+  val playJsonVersion = "2.8.0-M3"
   val playJson = Seq("com.typesafe.play" %% "play-json" % playJsonVersion)
 
   val slf4jApi = Seq("org.slf4j" % "slf4j-api" % "1.7.26")
@@ -40,20 +40,15 @@ object Dependencies {
   val signpostVersion = "1.2.1.2"
   val oauth = Seq("oauth.signpost" % "signpost-core" % signpostVersion)
 
-  val cachecontrolVersion = "2.0.0-M1"
+  val cachecontrolVersion = "2.0.0-M2"
   val cachecontrol = Seq("com.typesafe.play" %% "cachecontrol" % cachecontrolVersion)
 
   val asyncHttpClientVersion = "2.10.0"
   val asyncHttpClient = Seq("org.asynchttpclient" % "async-http-client" % asyncHttpClientVersion)
 
-  val akkaVersion = "2.6.0-M2"
+  val akkaVersion = "2.6.0-M3"
   val akkaStreams = Seq("com.typesafe.akka" %% "akka-stream" % akkaVersion)
-
-  val akkaHttpVersion = Def.setting(CrossVersion.partialVersion(scalaVersion.value) match {
-    case Some((2, 13)) => "10.1.8+26-f33ec39a"
-    case _             => "10.1.8"
-  })
-  val akkaHttp = Def.setting(Seq("com.typesafe.akka" %% "akka-http" % akkaHttpVersion.value))
+  val akkaHttp = Seq("com.typesafe.akka" %% "akka-http" % "10.1.8")
 
   val reactiveStreams = Seq("org.reactivestreams" % "reactive-streams" % "1.0.2")