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.

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.9.2 #3850

Merged
merged 3 commits into from
Mar 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ c94b1327f346ed0dddc374c7844aaa55080dc84f

# Scala Steward: Reformat with scalafmt 3.9.0
c0aa998df773a6f7263332168131491131e76dde

# Scala Steward: Reformat with scalafmt 3.9.2
2c560ca3aa5e35dee0d1ccf5a08c39a47b2e1707
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.9.1
version = 3.9.2
project.layout = StandardConvention
runner.dialect = scala3
maxColumn = 120
Expand Down
3 changes: 2 additions & 1 deletion airspec/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ def excludePomDependency(excludes: Seq[String]) = { node: XmlNode =>
}).transform(node).head
}

/** AirSpec build definitions.
/**
* AirSpec build definitions.
*
* To make AirSpec a standalone library without any cyclic project references, AirSpec embeds the source code of
* airframe-log, di, surface, etc.
Expand Down
2 changes: 1 addition & 1 deletion airspec/project/plugin.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
addDependencyTreePlugin

// For Scala.js
val SCALAJS_VERSION = sys.env.getOrElse("SCALAJS_VERSION", "1.18.2")
val SCALAJS_VERSION = sys.env.getOrElse("SCALAJS_VERSION", "1.18.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % SCALAJS_VERSION)
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")
libraryDependencies ++= (
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -974,7 +974,7 @@ lazy val fluentd =
"org.komamitsu" % "fluency-fluentd" % FLUENCY_VERSION,
"org.komamitsu" % "fluency-treasuredata" % FLUENCY_VERSION
// td-client-java -> json-simple happened to include junit 4.10 [CVE-2020-15250]
exclude ("junit", "junit"),
exclude ("junit", "junit"),
// Necessary for td-client-java, which is used in fluency-treasuredata
"com.fasterxml.jackson.datatype" % "jackson-datatype-json-org" % "2.18.2" % Provided,
"com.fasterxml.jackson.datatype" % "jackson-datatype-jdk8" % "2.18.2" % Provided,
Expand Down
2 changes: 1 addition & 1 deletion project/plugin.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ addSbtPlugin("org.wvlet.airframe" % "sbt-airframe" % SBT_AIRFRAME_VERSION)
addDependencyTreePlugin

// For Scala.js
val SCALAJS_VERSION = sys.env.getOrElse("SCALAJS_VERSION", "1.18.2")
val SCALAJS_VERSION = sys.env.getOrElse("SCALAJS_VERSION", "1.18.2")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % SCALAJS_VERSION)
addSbtPlugin("ch.epfl.scala" % "sbt-scalajs-bundler" % "0.21.1")
libraryDependencies ++= (
Expand Down
Loading