Skip to content

Commit

Permalink
Update scalafmt-core, scalafmt-dynamic to 3.8.1 (#2754)
Browse files Browse the repository at this point in the history
* Update scalafmt-core, scalafmt-dynamic to 3.8.1

* Reformat with scalafmt 3.8.1

Executed command: scalafmt --non-interactive

* Add 'Reformat with scalafmt 3.8.1' to .git-blame-ignore-revs
  • Loading branch information
scala-steward authored Apr 16, 2024
1 parent f43e379 commit db5dcf3
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 13 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,6 @@ d338861916380701fb1a3cf557bb2b0f18792075

# Scala Steward: Reformat with scalafmt 3.7.14
85133289bbd902a9fa5c13ff515eda5c0b58fd1d

# Scala Steward: Reformat with scalafmt 3.8.1
d4a7535a39fe713701919d4312e10e8de78b69d9
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.7.17
version = 3.8.1
maxColumn = 120

align.preset = more
Expand Down
20 changes: 10 additions & 10 deletions project/BuildHelper.scala
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ object BuildHelper extends ScalaSettings {
name := s"$prjName$shadedSuffix",
ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3),
ThisBuild / scalaVersion := Scala213,
scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value),
scalacOptions ++= stdOptions ++ extraOptions(scalaVersion.value),
ThisBuild / scalafixDependencies ++=
List(
"com.github.vovapolu" %% "scaluzzi" % "0.1.23",
Expand Down Expand Up @@ -145,7 +145,7 @@ object BuildHelper extends ScalaSettings {
for {
platform <- List("shared", platform)
version <- "scala" :: versions.toList.map("scala-" + _)
result = baseDirectory.getParentFile / platform.toLowerCase / "src" / conf / version
result = baseDirectory.getParentFile / platform.toLowerCase / "src" / conf / version
if result.exists
} yield result

Expand All @@ -155,9 +155,9 @@ object BuildHelper extends ScalaSettings {
List("2.12", "2.12+", "2.12-2.13", "2.x")
case Some((2, 13)) =>
List("2.13", "2.12+", "2.13+", "2.12-2.13", "2.x")
case Some((3,_)) =>
case Some((3, _)) =>
List("3")
case _ =>
case _ =>
List()
}
platformSpecificSources(platform, conf, baseDir)(versions: _*)
Expand All @@ -169,17 +169,17 @@ object BuildHelper extends ScalaSettings {
scalaVersion.value,
crossProjectPlatform.value.identifier,
"main",
baseDirectory.value
)
baseDirectory.value,
)
},
Test / unmanagedSourceDirectories ++= {
crossPlatformSources(
scalaVersion.value,
crossProjectPlatform.value.identifier,
"test",
baseDirectory.value
)
}
)
baseDirectory.value,
)
},
)

}
2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ object Dependencies {
val `jwt-core` = "com.github.jwt-scala" %% "jwt-core" % JwtCoreVersion
val `scala-compact-collection` = "org.scala-lang.modules" %% "scala-collection-compat" % ScalaCompactCollectionVersion

val scalafmt = "org.scalameta" %% "scalafmt-dynamic" % "3.7.17"
val scalafmt = "org.scalameta" %% "scalafmt-dynamic" % "3.8.1"

val netty =
Seq(
Expand Down
2 changes: 1 addition & 1 deletion zio-http/shared/src/main/scala/zio/http/Server.scala
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ object Server extends ServerPlatformSpecific {
zio.Config.int("level").withDefault(DefaultLevel) ++
zio.Config.int("bits").withDefault(DefaultBits) ++
zio.Config.int("mem").withDefault(DefaultMem) ++
CompressionOptions.CompressionType.config.nested("type"),
CompressionOptions.CompressionType.config.nested("type")
).map { case (level, bits, mem, kind) =>
CompressionOptions(level, bits, mem, kind)
}
Expand Down

0 comments on commit db5dcf3

Please sign in to comment.