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.5 #1229

Closed
wants to merge 3 commits into from
Closed

Update scalafmt-core to 3.8.5 #1229

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
bfcdec6
Update scalafmt-core to 3.8.5
scala-steward Jan 19, 2025
17da7c7
Reformat with scalafmt 3.8.5
scala-steward Jan 19, 2025
eef0bcd
Add 'Reformat with scalafmt 3.8.5' to .git-blame-ignore-revs
scala-steward Jan 19, 2025
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.5
17da7c777e0baac25286703de6b55a79c068acb9
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.2"
version = "3.8.5"
runner.dialect = scala213
maxColumn = 120
align.preset = most
Expand Down
4 changes: 2 additions & 2 deletions examples/interop-http4s/build.sbt
View file
Open in desktop
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
3 changes: 1 addition & 2 deletions zio-json/shared/src/main/scala-3/zio/json/union_derivation.scala
View file
Open in desktop
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
View file
Open in desktop
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