diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 6a654ce7..e59455fb 100644 --- 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 +07656d26503cb1f6037231eef6fb742961e23d95 diff --git a/.scalafmt.conf b/.scalafmt.conf index 8d4efe8e..46d3d82d 100644 --- 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 index ac414ec7..646feb07 100644 --- 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 index a39925ad..3c55cc2b 100644 --- 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))