Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update scalafmt-core to 3.8.2 #2284

Merged
merged 3 commits into from
Jun 16, 2024
Merged

Update scalafmt-core to 3.8.2 #2284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e189a7a
Update scalafmt-core to 3.8.2
scala-steward Jun 16, 2024
31f697d
Reformat with scalafmt 3.8.2
scala-steward Jun 16, 2024
c534f4d
Add 'Reformat with scalafmt 3.8.2' to .git-blame-ignore-revs
scala-steward Jun 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.2
31f697d44316b1023952d5ab817d770d05f2fa76
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.1"
version = "3.8.2"
runner.dialect = scala213
maxColumn = 120
align.preset = most
Expand Down
6 changes: 3 additions & 3 deletions benchmarks/src/main/scala/caliban/json/JsonEncodingBenchmark.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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._

Expand Down
10 changes: 5 additions & 5 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion federation/src/test/scala/caliban/federation/v2x/FederationV2Spec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
2 changes: 1 addition & 1 deletion tools/src/main/resources/default.scalafmt.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version=3.8.1
version=3.8.2
runner.dialect=scala3
Loading