Skip to content

Commit

Permalink
Update scalafmt-core to 3.8.6 (#1248)
Browse files Browse the repository at this point in the history
  • Loading branch information
scala-steward authored Jan 26, 2025
1 parent 8cde6d6 commit 7379de6
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.8.6
35c27463b6f38a27b119cc1d82f2e0e49e335789
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.8.2"
version = "3.8.6"
runner.dialect = scala213
maxColumn = 120
align.preset = most
Expand Down
4 changes: 2 additions & 2 deletions examples/interop-http4s/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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] })
2 changes: 0 additions & 2 deletions zio-json/shared/src/main/scala/zio/json/ast/ast.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit 7379de6

Please sign in to comment.