Merge pull request #12517 from scala-steward/update/3.0.x/patches

[3.0.x] Patch updates
playframework · Apr 26, 2024 · 7b5c684 · 7b5c684
2 parents 8d808e9 + b76222f
commit 7b5c684
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -31,3 +31,6 @@ cd2507a778ccaaa595117a632cb3c068b5984b83
 
 # Scala Steward: Reformat with scalafmt 3.7.17
 ec06efad503547d81c3e36e3ebf8cba44c6ce306
+
+# Scala Steward: Reformat with scalafmt 3.8.1
+a7c30c3ccc73061108573b84baaf13f9ee6e29ba
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -2,7 +2,7 @@
 # Keep this in sync with documentation/.scalafmt.conf
 
 # Version https://scalameta.org/scalafmt/docs/configuration.html#version
-version = 3.8.0
+version = 3.8.1
 # Dialect https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects
 runner.dialect = scala213
 

diff --git a/...ntegration-test/src/test/scala/play/it/http/parsingdeferred/DeferredBodyParsingSpec.scala b/...ntegration-test/src/test/scala/play/it/http/parsingdeferred/DeferredBodyParsingSpec.scala
@@ -86,7 +86,7 @@ object DeferredBodyParsingSpec {
         .contains(DeferredBodyParsing)}"
 
   def buildActionCompositionMessage(request: Request[_]) =
-    s"Action composition, body was parsed already: ${(request.body != null)}, internal request attribute set: ${request.attrs
+    s"Action composition, body was parsed already: ${request.body != null}, internal request attribute set: ${request.attrs
         .contains(DeferredBodyParsing)}"
 }
 

diff --git a/...in/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/tests/RouterSpec.scala b/...in/src/sbt-test/play-sbt-plugin/routes-compiler-routes-compilation/tests/RouterSpec.scala
@@ -102,7 +102,15 @@ object RouterSpec extends PlaySpecification {
       whenNoValue: Future[play.api.mvc.Result] => Any,
       whenNoParam: Future[play.api.mvc.Result] => Any
   ) =
-    testQueryParamBinding(paramType, path, successParams, expectationSuccess, whenNoValue, whenNoParam, withDefault = true)
+    testQueryParamBinding(
+      paramType,
+      path,
+      successParams,
+      expectationSuccess,
+      whenNoValue,
+      whenNoParam,
+      withDefault = true
+    )
 
   private def testQueryParamBinding(
       paramType: String,

diff --git a/documentation/.scalafmt.conf b/documentation/.scalafmt.conf
@@ -3,7 +3,7 @@
 # TODO remove when making documentation a subproject
 
 # Version https://scalameta.org/scalafmt/docs/configuration.html#version
-version = 3.8.0
+version = 3.8.1
 # Dialect https://scalameta.org/scalafmt/docs/configuration.html#scala-dialects
 runner.dialect = scala213
 

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -15,7 +15,7 @@ object Dependencies {
 
   val playJsonVersion = "3.0.2"
 
-  val logback = "ch.qos.logback" % "logback-classic" % "1.5.1"
+  val logback = "ch.qos.logback" % "logback-classic" % "1.5.3"
 
   val specs2Version = "4.20.5"
   val specs2Deps = Seq(
@@ -106,7 +106,7 @@ object Dependencies {
       }
     })
 
-  val springFrameworkVersion = "5.3.32"
+  val springFrameworkVersion = "5.3.33"
 
   val javaDeps = Seq(
     // Used by the Java routing DSL
@@ -291,7 +291,7 @@ object Dependencies {
     "com.github.ben-manes.caffeine" % "jcache"   % caffeineVersion
   ) ++ jcacheApi
 
-  val playWsStandaloneVersion = "3.0.1"
+  val playWsStandaloneVersion = "3.0.2"
   val playWsDeps = Seq(
     "org.playframework" %% "play-ws-standalone"      % playWsStandaloneVersion,
     "org.playframework" %% "play-ws-standalone-xml"  % playWsStandaloneVersion,