diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..97105f54 --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.5 +17da7c777e0baac25286703de6b55a79c068acb9 diff --git a/.scalafmt.conf b/.scalafmt.conf index 1b52c7a5..3301d459 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.8.2" +version = "3.8.5" runner.dialect = scala213 maxColumn = 120 align.preset = most diff --git a/examples/interop-http4s/build.sbt b/examples/interop-http4s/build.sbt index 3287077a..2cc15938 100644 --- a/examples/interop-http4s/build.sbt +++ b/examples/interop-http4s/build.sbt @@ -3,8 +3,8 @@ val ZioJsonVersion = "0.1.3+8-6eb41b5a-SNAPSHOT" lazy val zioJsonHttp4sExample = (project in file(".")) .settings( - name := "zio-json-http4s-example", - version := "1.0", + name := "zio-json-http4s-example", + version := "1.0", scalaVersion := "2.13.5", scalacOptions ++= Seq("-Xlint:_"), // Only required when using a zio-json snapshot diff --git a/zio-json/shared/src/main/scala-3/zio/json/union_derivation.scala b/zio-json/shared/src/main/scala-3/zio/json/union_derivation.scala index e733473e..21b05e99 100644 --- a/zio-json/shared/src/main/scala-3/zio/json/union_derivation.scala +++ b/zio-json/shared/src/main/scala-3/zio/json/union_derivation.scala @@ -56,5 +56,4 @@ private[json] object UnionDerivation: report.errorAndAbort(s"${o.show} is not a subtype of ${bound.show}") transformTypes(tpe).distinct.map(_.asType match - case '[t] => '{ constValue[t] } - ) + case '[t] => '{ constValue[t] }) diff --git a/zio-json/shared/src/main/scala/zio/json/ast/ast.scala b/zio-json/shared/src/main/scala/zio/json/ast/ast.scala index 3fac2459..9a21b1d7 100644 --- a/zio-json/shared/src/main/scala/zio/json/ast/ast.scala +++ b/zio-json/shared/src/main/scala/zio/json/ast/ast.scala @@ -205,9 +205,7 @@ sealed abstract class Json { self => /** * - merging objects results in a new objects with all pairs of both sides, with the right hand side being used on * key conflicts - * * - merging arrays results in all of the individual elements being merged - * * - scalar values will be replaced by the right hand side */ final def merge(that: Json): Json =