From e189a7ab01631be49a64fbe5cd9811e91c78f428 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 16:00:12 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.8.2 --- .scalafmt.conf | 2 +- tools/src/main/resources/default.scalafmt.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 1f3c4a9965..fb2843da5f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.1" +version = "3.8.2" runner.dialect = scala213 maxColumn = 120 align.preset = most diff --git a/tools/src/main/resources/default.scalafmt.conf b/tools/src/main/resources/default.scalafmt.conf index b960f2a3dd..bbd29399ab 100644 --- a/tools/src/main/resources/default.scalafmt.conf +++ b/tools/src/main/resources/default.scalafmt.conf @@ -1,2 +1,2 @@ -version=3.8.1 +version=3.8.2 runner.dialect=scala3 \ No newline at end of file From 31f697d44316b1023952d5ab817d770d05f2fa76 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 16:00:55 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.8.2 Executed command: scalafmt --non-interactive --- .../scala/caliban/json/JsonEncodingBenchmark.scala | 6 +++--- build.sbt | 10 +++++----- .../caliban/federation/v2x/FederationV2Spec.scala | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/benchmarks/src/main/scala/caliban/json/JsonEncodingBenchmark.scala b/benchmarks/src/main/scala/caliban/json/JsonEncodingBenchmark.scala index 7c70554f6a..1baf9b0d2f 100644 --- a/benchmarks/src/main/scala/caliban/json/JsonEncodingBenchmark.scala +++ b/benchmarks/src/main/scala/caliban/json/JsonEncodingBenchmark.scala @@ -1,9 +1,9 @@ package caliban.json import caliban.Value._ -import caliban.interop.circe.json.GraphQLResponseCirce.{graphQLResponseEncoder => circeEncoder} -import caliban.interop.zio.GraphQLResponseZioJson.{graphQLResponseEncoder => zioEncoder} -import caliban.{GraphQLResponse, ResponseValue} +import caliban.interop.circe.json.GraphQLResponseCirce.{ graphQLResponseEncoder => circeEncoder } +import caliban.interop.zio.GraphQLResponseZioJson.{ graphQLResponseEncoder => zioEncoder } +import caliban.{ GraphQLResponse, ResponseValue } import com.github.plokhotnyuk.jsoniter_scala.core._ import org.openjdk.jmh.annotations._ diff --git a/build.sbt b/build.sbt index b2708faf2d..8de8f4a0ef 100644 --- a/build.sbt +++ b/build.sbt @@ -410,11 +410,11 @@ lazy val akkaHttp = project ideSkipProject := (scalaVersion.value == scala3), crossScalaVersions -= scala3, libraryDependencies ++= Seq( - "com.typesafe.akka" %% "akka-http" % "10.2.10", - "com.typesafe.akka" %% "akka-serialization-jackson" % akkaVersion, - "com.softwaremill.sttp.tapir" %% "tapir-akka-http-server" % tapirVersion, - "com.softwaremill.sttp.tapir" %% "tapir-json-circe" % tapirVersion % Test, - compilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.3").cross(CrossVersion.full)) + "com.typesafe.akka" %% "akka-http" % "10.2.10", + "com.typesafe.akka" %% "akka-serialization-jackson" % akkaVersion, + "com.softwaremill.sttp.tapir" %% "tapir-akka-http-server" % tapirVersion, + "com.softwaremill.sttp.tapir" %% "tapir-json-circe" % tapirVersion % Test, + compilerPlugin(("org.typelevel" %% "kind-projector" % "0.13.3").cross(CrossVersion.full)) ) ) .dependsOn(core, tapirInterop % "compile->compile;test->test") diff --git a/federation/src/test/scala/caliban/federation/v2x/FederationV2Spec.scala b/federation/src/test/scala/caliban/federation/v2x/FederationV2Spec.scala index b6b1c46d82..1ab0b32cb9 100644 --- a/federation/src/test/scala/caliban/federation/v2x/FederationV2Spec.scala +++ b/federation/src/test/scala/caliban/federation/v2x/FederationV2Spec.scala @@ -230,7 +230,7 @@ object FederationV2Spec extends ZIOSpecDefault { } yield document.definitions.flatMap { case Definition.TypeSystemDefinition.SchemaDefinition(d, _, _, _, _) => d.map(_.copy(index = 0)) // Unset the index to make the test deterministic - case _ => Nil + case _ => Nil } } } From c534f4df1a6cb4f98d660c50844b61fd6797006f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 16 Jun 2024 16:00:55 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 0000000000..18f185991e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.2 +31f697d44316b1023952d5ab817d770d05f2fa76