.git-blame-ignore-revs

@@ -6,3 +6,12 @@
 
 # Scala Steward: Reformat with scalafmt 3.7.5
 d284d98d04e21841acd9c5cd4640279c877459c6
+
+# Scala Steward: Reformat with scalafmt 3.7.17
+07656d26503cb1f6037231eef6fb742961e23d95
+
+# Scala Steward: Reformat with scalafmt 3.8.2
+aea577073fb21a3abae14915dc7c556e13592c16
+
+# Scala Steward: Reformat with scalafmt 3.8.6
+59f48891eca2bd9682aa3bcddedbeae290270ba0

.github/dependabot.yml

@@ -0,0 +1,20 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "3.0.x"
+    commit-message:
+      prefix: "[3.0.x] "
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+    target-branch: "2.10.x"
+    commit-message:
+      prefix: "[2.10.x] "

.github/scala-steward.conf

@@ -8,7 +8,10 @@ pullRequests.grouping = [
 
 updates.ignore = [
   // these will get updated along with jackson-core, so no need to update them separately
-  { groupId = "com.fasterxml.jackson.core", artifactId = "jackson-annotations" }
-  { groupId = "com.fasterxml.jackson.datatype", artifactId = "jackson-datatype-jdk8" }
+  { groupId = "com.fasterxml.jackson.core", artifactId = "jackson-annotations" },
+  { groupId = "com.fasterxml.jackson.datatype", artifactId = "jackson-datatype-jdk8" },
   { groupId = "com.fasterxml.jackson.datatype", artifactId = "jackson-datatype-jsr310" }
 ]
+
+updates.pin = [
+]

.github/workflows/build-test.yml

@@ -15,17 +15,17 @@ concurrency:
 jobs:
   check-code-style:
     name: Code Style
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       cmd: sbt validateCode
 
   check-binary-compatibility:
     name: Binary Compatibility
-    uses: playframework/.github/.github/workflows/binary-check.yml@v3
+    uses: playframework/.github/.github/workflows/binary-check.yml@v4
 
   check-docs:
     name: Docs
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
       cmd: sbt docs/validateDocs
 
@@ -35,9 +35,9 @@ jobs:
       - "check-code-style"
       - "check-binary-compatibility"
       - "check-docs"
-    uses: playframework/.github/.github/workflows/cmd.yml@v3
+    uses: playframework/.github/.github/workflows/cmd.yml@v4
     with:
-      java: 17, 11
+      java: 21, 17
       scala: 2.12.x, 2.13.x, 3.x
       cmd: scripts/test-code.sh
 
@@ -46,4 +46,4 @@ jobs:
     if: github.event_name == 'pull_request'
     needs: # Should be last
       - "tests"
-    uses: playframework/.github/.github/workflows/rtm.yml@v3
+    uses: playframework/.github/.github/workflows/rtm.yml@v4

.github/workflows/dependency-graph.yml

@@ -17,10 +17,11 @@ jobs:
     name: Submit dependencies to GitHub
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0
           ref: ${{ inputs.ref }}
-      - uses: scalacenter/sbt-dependency-submission@v2
+      - uses: sbt/setup-sbt@v1
+      - uses: scalacenter/sbt-dependency-submission@v3
         with:
           modules-ignore: docs_2.12 play-functional_2.12 play-json-joda_2.12 play-json_2.12 play-functional_sjs1_2.12 play-json_sjs1_2.12

.github/workflows/publish.yml

@@ -5,11 +5,9 @@ on:
     branches: # Snapshots
       - main
     tags: ["**"] # Releases
-  release:
-    types: [published]
 
 jobs:
   publish-artifacts:
     name: Publish / Artifacts
-    uses: playframework/.github/.github/workflows/publish.yml@v3
+    uses: playframework/.github/.github/workflows/publish.yml@v4
     secrets: inherit

.github/workflows/release-drafter.yml

@@ -9,7 +9,7 @@ jobs:
   update_release_draft:
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v5
+      - uses: release-drafter/release-drafter@v6
         with:
           name: "Play JSON $RESOLVED_VERSION"
           config-name: release-drafts/increasing-minor-version.yml # located in .github/ in the default branch within this or the .github repo

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.7.15
+version = 3.9.1
 runner.dialect = Scala213Source3
 
 align.preset = true
@@ -51,4 +51,12 @@ fileOverride {
 
 project.excludePaths = [
   "glob:**/docs/**/code*/*.scala"
-]
+]
+
+rewrite.scala3.convertToNewSyntax = true
+runner.dialectOverride {
+  allowSignificantIndentation = false
+  allowAsForImportRename = false
+  allowStarWildcardImport = false
+  allowPostfixStarVarargSplices = false
+}

build.sbt

@@ -18,7 +18,7 @@ val isScala3 = Def.setting {
 
 def specs2(scalaVersion: String) =
   Seq("core", "junit").map { n =>
-    ("org.specs2" %% s"specs2-$n" % "4.20.2") % Test
+    ("org.specs2" %% s"specs2-$n" % "4.20.9") % Test
   }
 
 val jacksonDatabindVersion = "2.14.3"
@@ -35,31 +35,45 @@ val jacksons = Seq(
 ).map(_ % jacksonVersion) ++ jacksonDatabind
 
 val joda = Seq(
-  "joda-time" % "joda-time" % "2.12.5"
+  "joda-time" % "joda-time" % "2.13.1"
 )
 
 // Common settings
 
-val previousVersion: Option[String] = Some("3.0.0")
+val previousVersion: Option[String] = Some("3.1.0-M1")
 
 // Do not check for previous JS artifacts for upgrade to Scala.js 1.0 because no sjs1 artifacts exist
 def playJsonMimaSettings = Seq(
   mimaPreviousArtifacts := previousVersion.map(organization.value %%% moduleName.value % _).toSet,
-  mimaBinaryIssueFilters ++= Seq(
-  ),
+  mimaBinaryIssueFilters ++= {
+    val missingMethodInOld: ProblemFilter = {
+      case ReversedAbstractMethodProblem(_) | ReversedMissingMethodProblem(_) =>
+        false
+
+      case DirectMissingMethodProblem(old)         => old.nonAccessible
+      case InheritedNewAbstractMethodProblem(_, _) => false
+      case IncompatibleResultTypeProblem(old, _)   => old.nonAccessible
+      case IncompatibleMethTypeProblem(old, _)     => old.nonAccessible
+      case MissingClassProblem(old)                => !old.isPublic
+      case AbstractClassProblem(old)               => !old.isPublic
+      case _                                       => true
+    }
+
+    Seq(missingMethodInOld)
+  }
 )
 
 val javacSettings = Seq(
   "-source",
-  "11",
+  "17",
   "-Xlint:deprecation",
   "-Xlint:unchecked",
 )
 
 val scalacOpts = Seq(
   "-language:higherKinds",
   "-release",
-  "11",
+  "17",
   "-Ywarn-unused:imports",
   "-Xlint:nullary-unit",
   "-Xlint",
@@ -96,7 +110,7 @@ lazy val commonSettings = Def.settings(
   crossScalaVersions := Seq(Dependencies.Scala212, Dependencies.Scala213, Dependencies.Scala3),
   Compile / javacOptions ++= javacSettings,
   Test / javacOptions ++= javacSettings,
-  Compile / compile / javacOptions ++= Seq("--release", "11"), // sbt #1785, avoids passing to javadoc
+  Compile / compile / javacOptions ++= Seq("--release", "17"), // sbt #1785, avoids passing to javadoc
   scalacOptions ++= (if (isScala3.value) Nil else scalacOpts),
   Compile / doc / scalacOptions ++= Seq(
     // Work around 2.12 bug which prevents javadoc in nested java classes from compiling.
@@ -133,7 +147,7 @@ lazy val `play-json` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   )
   .nativeSettings(
     libraryDependencies ++= Seq(
-      "org.typelevel" %%% "jawn-parser" % "1.5.1"
+      "org.typelevel" %%% "jawn-parser" % "1.6.0"
     )
   )
   .settings(
@@ -144,9 +158,9 @@ lazy val `play-json` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
           Seq("org.scala-lang" % "scala-reflect" % scalaVersion.value)
       ),
       libraryDependencies ++= Seq(
-        "org.scalatest"     %%% "scalatest"       % "3.2.17"   % Test,
-        "org.scalatestplus" %%% "scalacheck-1-16" % "3.2.14.0" % Test,
-        "org.scalacheck"    %%% "scalacheck"      % "1.17.0"   % Test,
+        "org.scalatest"     %%% "scalatest"       % "3.2.19"   % Test,
+        "org.scalatestplus" %%% "scalacheck-1-18" % "3.2.19.0" % Test,
+        "org.scalacheck"    %%% "scalacheck"      % "1.18.1"   % Test,
       ),
       libraryDependencies += {
         if (isScala3.value) {
@@ -237,7 +251,7 @@ lazy val `play-jsonJVM` = `play-json`.jvm
         else
           specs2(scalaVersion.value)
       } :+ (
-        "ch.qos.logback" % "logback-classic" % "1.4.11" % Test
+        "ch.qos.logback" % "logback-classic" % "1.5.17" % Test
       ),
     Test / unmanagedSourceDirectories ++= (docsP / PlayDocsKeys.scalaManualSourceDirectories).value,
   )

play-functional/src/main/scala/play/api/libs/functional/Products.scala

@@ -3000,8 +3000,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
         B
       ](
         canBuild(m1, m2),
-        { case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 =>
-          f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+        {
+          case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 =>
+            f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
         }
       )
 
@@ -3061,8 +3062,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
         B
       ](
         canBuild(m1, m2),
-        { case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 =>
-          f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
+        {
+          case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 =>
+            f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20)
         },
         (b: B) => {
           val (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) = f2(b);
@@ -3408,8 +3410,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
         B
       ](
         canBuild(m1, m2),
-        { case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 =>
-          f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21)
+        {
+          case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 =>
+            f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21)
         }
       )
 
@@ -3472,8 +3475,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
         B
       ](
         canBuild(m1, m2),
-        { case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 =>
-          f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21)
+        {
+          case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 =>
+            f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21)
         },
         (b: B) => {
           val (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21) = f2(b);
@@ -3805,8 +3809,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
         B
       ](
         canBuild(m1, m2),
-        { case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 ~ a22 =>
-          f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22)
+        {
+          case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 ~ a22 =>
+            f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22)
         }
       )
 
@@ -3873,8 +3878,9 @@ class FunctionalBuilder[M[_]](canBuild: FunctionalCanBuild[M]) {
         B
       ](
         canBuild(m1, m2),
-        { case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 ~ a22 =>
-          f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22)
+        {
+          case a1 ~ a2 ~ a3 ~ a4 ~ a5 ~ a6 ~ a7 ~ a8 ~ a9 ~ a10 ~ a11 ~ a12 ~ a13 ~ a14 ~ a15 ~ a16 ~ a17 ~ a18 ~ a19 ~ a20 ~ a21 ~ a22 =>
+            f1(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22)
         },
         (b: B) => {
           val (a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20, a21, a22) =

play-json/js/src/main/scala/StaticBinding.scala

@@ -40,7 +40,7 @@ object StaticBinding {
     case l: Long        => JsNumber(l)
     case true           => JsTrue
     case false          => JsFalse
-    case a: js.Array[_] => JsArray(a.map(anyToJsValue).toArray[JsValue])
+    case a: js.Array[?] => JsArray(a.map(anyToJsValue).toArray[JsValue])
 
     case o: js.Object => {
       JsObject((for {

play-json/jvm/src/main/scala/play/api/libs/json/jackson/JacksonJson.scala

@@ -150,7 +150,7 @@ private[jackson] case class ReadingMap(content: ListBuffer[(String, JsValue)]) e
     throw new Exception("Cannot add a value on an object without a key, malformed JSON object!")
 }
 
-private[jackson] class JsValueDeserializer(factory: TypeFactory, klass: Class[_], jsonConfig: JsonConfig)
+private[jackson] class JsValueDeserializer(factory: TypeFactory, klass: Class[?], jsonConfig: JsonConfig)
     extends JsonDeserializer[Object] {
   override def isCachable: Boolean = true