Merge pull request #953 from scala-steward/update/2.10.x/patches

[2.10.x] Patch updates
playframework · Dec 13, 2023 · 1a90fa8 · 1a90fa8
2 parents 10cd132 + fc31769
commit 1a90fa8
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -6,3 +6,6 @@
 
 # Scala Steward: Reformat with scalafmt 3.7.5
 d284d98d04e21841acd9c5cd4640279c877459c6
+
+# Scala Steward: Reformat with scalafmt 3.7.17
+f01d82bf09875cb097d23941663a89689e1a9af7
diff --git a/.scalafmt.conf b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = 3.7.15
+version = 3.7.17
 runner.dialect = Scala213Source3
 
 align.preset = true

diff --git a/build.sbt b/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.3") % Test
   }
 
 val jacksonDatabindVersion = "2.14.3"

diff --git a/play-json/shared/src/main/scala-2.13-/play/api/libs/json/ImmutableLinkedHashMap.scala b/play-json/shared/src/main/scala-2.13-/play/api/libs/json/ImmutableLinkedHashMap.scala
@@ -21,7 +21,8 @@ import scala.collection.mutable.ArrayBuffer
 private[json] class ImmutableLinkedHashMap[A, +B](underlying: JLinkedHashMap[A, B])
     extends AbstractMap[A, B]
     with Map[A, B]
-    with MapLike[A, B, ImmutableLinkedHashMap[A, B]] with Serializable {
+    with MapLike[A, B, ImmutableLinkedHashMap[A, B]]
+    with Serializable {
 
   override def get(key: A): Option[B] = Option(underlying.get(key))