Upgrade versions

build.sbt

@@ -256,6 +256,7 @@ lazy val PlayLogback = PlayCrossBuiltProject("Play-Logback", "core/play-logback"
 lazy val PlayWsProject = PlayCrossBuiltProject("Play-WS", "transport/client/play-ws")
   .settings(
     libraryDependencies ++= playWsDeps,
+    excludeDependencies += "com.typesafe.play" %% "twirl-api",
     (Test / parallelExecution) := false,
     // quieten deprecation warnings in tests
     (Test / scalacOptions) := (Test / scalacOptions).value.diff(Seq("-deprecation"))
@@ -266,6 +267,7 @@ lazy val PlayWsProject = PlayCrossBuiltProject("Play-WS", "transport/client/play
 lazy val PlayAhcWsProject = PlayCrossBuiltProject("Play-AHC-WS", "transport/client/play-ahc-ws")
   .settings(
     libraryDependencies ++= playAhcWsDeps,
+    excludeDependencies += "com.typesafe.play" %% "twirl-api",
     (Test / parallelExecution) := false,
     // quieten deprecation warnings in tests
     (Test / scalacOptions) := (Test / scalacOptions).value.diff(Seq("-deprecation"))
@@ -277,6 +279,7 @@ lazy val PlayAhcWsProject = PlayCrossBuiltProject("Play-AHC-WS", "transport/clie
 
 lazy val PlayOpenIdProject = PlayCrossBuiltProject("Play-OpenID", "web/play-openid")
   .settings(
+    excludeDependencies += "com.typesafe.play" %% "twirl-api",
     (Test / parallelExecution) := false,
     // quieten deprecation warnings in tests
     (Test / scalacOptions) := (Test / scalacOptions).value.diff(Seq("-deprecation"))
@@ -312,6 +315,7 @@ lazy val PlayIntegrationTestProject = PlayCrossBuiltProject("Play-Integration-Te
     mimaPreviousArtifacts := Set.empty,
     (IntegrationTest / fork) := true,
     (IntegrationTest / javaOptions) += "-Dfile.encoding=UTF8",
+    excludeDependencies += "com.typesafe.play" %% "twirl-api",
   )
   .dependsOn(
     PlayProject       % "it->test",
@@ -345,6 +349,8 @@ lazy val PlayMicrobenchmarkProject = PlayCrossBuiltProject("Play-Microbenchmark"
     (Jmh / generateJmhSourcesAndResources) := (Jmh / generateJmhSourcesAndResources).dependsOn((Test / compile)).value,
     (Jmh / run / mainClass) := Some("org.openjdk.jmh.Main"),
     (Test / parallelExecution) := false,
+    excludeDependencies += "org.specs2" %% "specs2-junit",
+    excludeDependencies += "com.typesafe.play" %% "twirl-api",
     mimaPreviousArtifacts := Set.empty
   )
   .dependsOn(

project/Dependencies.scala

@@ -7,16 +7,16 @@ import Keys._
 import buildinfo.BuildInfo
 
 object Dependencies {
-  val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.14")
+  val akkaVersion: String = sys.props.getOrElse("akka.version", "2.6.17")
   val akkaHttpVersion     = sys.props.getOrElse("akka.http.version", "10.1.14")
 
-  val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.4.3"
+  val sslConfig = "com.typesafe" %% "ssl-config-core" % "0.6.0"
 
   val playJsonVersion = "2.9.2"
 
   val logback = "ch.qos.logback" % "logback-classic" % "1.2.6"
 
-  val specs2Version = "4.12.12"
+  val specs2Version = "4.13.0"
   val specs2Deps = Seq(
     "specs2-core",
     "specs2-junit",
@@ -80,8 +80,8 @@ object Dependencies {
   )
 
   def scalaReflect(scalaVersion: String) = "org.scala-lang" % "scala-reflect" % scalaVersion % "provided"
-  val scalaJava8Compat                   = "org.scala-lang.modules" %% "scala-java8-compat" % "0.9.1"
-  val scalaParserCombinators             = Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2")
+  val scalaJava8Compat                   = "org.scala-lang.modules" %% "scala-java8-compat" % "1.0.2"
+  val scalaParserCombinators             = Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.0")
 
   val springFrameworkVersion = "5.3.12"
 
@@ -165,7 +165,7 @@ object Dependencies {
   val okHttp = "com.squareup.okhttp3" % "okhttp" % "4.9.2"
 
   def routesCompilerDependencies(scalaVersion: String) = {
-    specs2Deps.map(_ % Test) ++ Seq(specsMatcherExtra % Test) ++ scalaParserCombinators ++ (logback % Test :: Nil)
+    specs2Deps.map(_ % Test) ++ Seq(specsMatcherExtra % Test) ++ Seq("org.scala-lang.modules" %% "scala-parser-combinators" % "1.1.2") ++ (logback % Test :: Nil)
   }
 
   private def sbtPluginDep(moduleId: ModuleID, sbtVersion: String, scalaVersion: String) = {
@@ -193,7 +193,7 @@ object Dependencies {
       slf4jSimple,
       playFileWatch,
       sbtDep("com.typesafe.sbt" % "sbt-twirl"           % BuildInfo.sbtTwirlVersion),
-      sbtDep("com.typesafe.sbt" % "sbt-native-packager" % BuildInfo.sbtNativePackagerVersion),
+      sbtDep("com.github.sbt"   % "sbt-native-packager" % BuildInfo.sbtNativePackagerVersion),
       sbtDep("com.typesafe.sbt" % "sbt-web"             % "1.4.4"),
       sbtDep("com.typesafe.sbt" % "sbt-js-engine"       % "1.2.3"),
       logback             % Test
@@ -263,7 +263,7 @@ object Dependencies {
     "com.github.ben-manes.caffeine" % "jcache"   % caffeineVersion
   ) ++ jcacheApi
 
-  val playWsStandaloneVersion = "2.1.3"
+  val playWsStandaloneVersion = "2.1.2+300-e8072af1"
   val playWsDeps = Seq(
     "com.typesafe.play" %% "play-ws-standalone"      % playWsStandaloneVersion,
     "com.typesafe.play" %% "play-ws-standalone-xml"  % playWsStandaloneVersion,

project/plugins.sbt

@@ -4,15 +4,15 @@ enablePlugins(BuildInfoPlugin)
 
 // when updating sbtNativePackager version, be sure to also update the documentation links in
 // documentation/manual/working/commonGuide/production/Deploying.md
-val sbtNativePackager  = "1.8.1"
+val sbtNativePackager  = "1.9.6"
 val mima               = "1.0.1"
 val sbtJavaFormatter   = "0.5.0"
 val sbtJmh             = "0.4.3"
 val webjarsLocatorCore = "0.48"
 val sbtHeader          = "5.6.0"
 val scalafmt           = "2.0.1"
-val sbtTwirl: String   = sys.props.getOrElse("twirl.version", "1.5.1") // sync with documentation/project/plugins.sbt
-val interplay: String  = sys.props.getOrElse("interplay.version", "3.0.3")
+val sbtTwirl: String   = sys.props.getOrElse("twirl.version", "1.5.0+263-c57d350b+20210831-0025-SNAPSHOT") // sync with documentation/project/plugins.sbt
+val interplay: String  = sys.props.getOrElse("interplay.version", "3.0.3+31-bc4c66d7")
 
 buildInfoKeys := Seq[BuildInfoKey](
   "sbtNativePackagerVersion" -> sbtNativePackager,

transport/client/play-ahc-ws/src/main/java/play/libs/ws/ahc/AhcWSRequest.java

@@ -332,6 +332,11 @@ public WSRequest setFollowRedirects(boolean followRedirects) {
     return converter.apply(request.setFollowRedirects(followRedirects));
   }
 
+  @Override
+  public WSRequest setDisableUrlEncoding(boolean disableUrlEncoding) {
+    return converter.apply(request.setDisableUrlEncoding(disableUrlEncoding));
+  }
+
   @Override
   public WSRequest setVirtualHost(String virtualHost) {
     return converter.apply(request.setVirtualHost(virtualHost));
@@ -394,6 +399,11 @@ public Optional<Boolean> getFollowRedirects() {
     return request.getFollowRedirects();
   }
 
+  @Override
+  public Optional<Boolean> getDisableUrlEncoding() {
+    return request.getDisableUrlEncoding();
+  }
+
   @Override
   public String getUrl() {
     return request.getUrl();

transport/client/play-ahc-ws/src/main/scala/play/api/libs/ws/ahc/AhcWSRequest.scala

@@ -127,6 +127,10 @@ case class AhcWSRequest(underlying: StandaloneAhcWSRequest) extends WSRequest wi
     underlying.withFollowRedirects(follow)
   }
 
+  override def withDisableUrlEncoding(disableUrlEncoding: Boolean): Self = toWSRequest {
+    underlying.withDisableUrlEncoding(disableUrlEncoding)
+  }
+
   override def withRequestTimeout(timeout: Duration): Self = toWSRequest {
     underlying.withRequestTimeout(timeout)
   }