From 2d6b5ec30b3a5c35e5c1861a9ae8dd537aa2c03d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 21:58:01 +0200 Subject: [PATCH 1/4] [2.10.x] scalafmt-core 3.8.2 (was 3.8.1) --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 459e21566..fed9dd481 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.8.1 +version = 3.8.2 runner.dialect = Scala213Source3 align.preset = true From ee28fcc87de813e8346c57b6bcfc42dadfe6c532 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 21:58:05 +0200 Subject: [PATCH 2/4] Reformat with scalafmt 3.8.2 Executed command: scalafmt --non-interactive --- .../libs/json/JsonMemoryFootprintSpec.scala | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/play-json/jvm/src/test/scala-3/play/api/libs/json/JsonMemoryFootprintSpec.scala b/play-json/jvm/src/test/scala-3/play/api/libs/json/JsonMemoryFootprintSpec.scala index 1ac2b98df..06f53117d 100644 --- a/play-json/jvm/src/test/scala-3/play/api/libs/json/JsonMemoryFootprintSpec.scala +++ b/play-json/jvm/src/test/scala-3/play/api/libs/json/JsonMemoryFootprintSpec.scala @@ -13,8 +13,14 @@ class JsonMemoryFootprintSpec extends AnyFreeSpec { "Json.parse" - { "obj0" in assertSizes("""{}""", 16, 16) - "obj1" in assertSizes("""{"1":true}""", 152, 168, expectedJdk21 = Some(160), hashedJdk21 = Some(184)) - "obj4" in assertSizes("""{"1":true,"2":true,"3":true,"4":true}""", 296, 312, expectedJdk21 = Some(304), hashedJdk21 = Some(328)) + "obj1" in assertSizes("""{"1":true}""", 152, 168, expectedJdk21 = Some(160), hashedJdk21 = Some(184)) + "obj4" in assertSizes( + """{"1":true,"2":true,"3":true,"4":true}""", + 296, + 312, + expectedJdk21 = Some(304), + hashedJdk21 = Some(328) + ) "arr0" in assertSizes("""[]""", 40, 40) "arr1" in assertSizes("""[true]""", 120, 120) @@ -45,13 +51,19 @@ class JsonMemoryFootprintSpec extends AnyFreeSpec { def arr1KB(elem: String, targetSize: Int = 1000): String = Iterator.continually(elem).take(targetSize / (elem.length + 1)).mkString("[", ",", "]") "obj0" in assertSizes(arr1KB("{}"), 7432, 7432) - "obj1" in assertSizes(arr1KB("""{"a":6}"""), 29568, 31568, expectedJdk21 = Some(30568), hashedJdk21 = Some(33568)) + "obj1" in assertSizes(arr1KB("""{"a":6}"""), 29568, 31568, expectedJdk21 = Some(30568), hashedJdk21 = Some(33568)) "nums" in assertSizes(arr1KB("6"), 42104, 42104) "arr0" in assertSizes(arr1KB("[]"), 15424, 15424) "arr1" in assertSizes(arr1KB("[6]"), 51080, 51080) } - private def assertSizes(input: String, expected: Long, hashed: Long, expectedJdk21: Option[Long] = None, hashedJdk21: Option[Long] = None) = { + private def assertSizes( + input: String, + expected: Long, + hashed: Long, + expectedJdk21: Option[Long] = None, + hashedJdk21: Option[Long] = None + ) = { assertSize(Json.parse(input), expected, expectedJdk21) withClue("After hashCode():")( assertSize( From 17050b5293672e5b2d5327c5e5cd4590ccf10e5f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 21:58:05 +0200 Subject: [PATCH 3/4] Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9cc0bf81c..f4378c23b 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -9,3 +9,6 @@ d284d98d04e21841acd9c5cd4640279c877459c6 # Scala Steward: Reformat with scalafmt 3.7.17 f01d82bf09875cb097d23941663a89689e1a9af7 + +# Scala Steward: Reformat with scalafmt 3.8.2 +ee28fcc87de813e8346c57b6bcfc42dadfe6c532 From 9ad22cff04aec6b7d04c73ef43193786fbeebcca Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 21:58:06 +0200 Subject: [PATCH 4/4] [2.10.x] specs2-core 4.20.7 (was 4.20.5) --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index ae1f72056..cfb0583c0 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.5") % Test + ("org.specs2" %% s"specs2-$n" % "4.20.7") % Test } val jacksonDatabindVersion = "2.14.3"