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.9.0 #1378

Merged
merged 3 commits into from
Feb 19, 2025
Merged

Update scalafmt-core to 3.9.0 #1378

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
efda3f1
Update scalafmt-core to 3.9.0
scala-steward Feb 17, 2025
eef94e3
Reformat with scalafmt 3.9.0
scala-steward Feb 17, 2025
d9498bd
Add 'Reformat with scalafmt 3.9.0' to .git-blame-ignore-revs
scala-steward Feb 17, 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
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ de0c947a407f2d7cbbdd926e33c77842b984f9f6

# reformat with 3.8.6
90ccd87e19dfa642c8fb789d336a1eba55a6c306

# Scala Steward: Reformat with scalafmt 3.9.0
eef94e3679cbded0d9ca748009cecb558d38489b
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.6"
version = "3.9.0"

rewrite.rules = [RedundantBraces, SortModifiers, Imports]
rewrite.redundantBraces.generalExpressions = false
Expand Down
19 changes: 12 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,12 +207,11 @@ lazy val core =
,
autoCompilerPlugins := true,
addCompilerPlugin("com.lihaoyi" % s"acyclic_${versionString}" % "0.3.16"),
scalacOptions += "-P:acyclic:force",
)
.dependsOn(base, proto)
.jsSettings(
commonJsSettings,
)
scalacOptions += "-P:acyclic:force"
).dependsOn(base, proto)
.jsSettings(
commonJsSettings
)

lazy val coreJVM = core.jvm
lazy val coreJS =
Expand All @@ -226,7 +225,13 @@ lazy val cliJS =
name := "bosatsu-clijs",
assembly / test := {},
mainClass := Some("org.bykn.bosatsu.tool.Fs2Main"),
libraryDependencies ++= Seq(fs2core.value, fs2io.value, catsEffect.value, http4sCore.value, http4sEmber.value)
libraryDependencies ++= Seq(
fs2core.value,
fs2io.value,
catsEffect.value,
http4sCore.value,
http4sEmber.value
)
)
.jsSettings(
scalaJSLinkerConfig ~= { _.withModuleKind(ModuleKind.CommonJSModule) },
Expand Down
6 changes: 4 additions & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ object Dependencies {
lazy val jawnParser = Def.setting("org.typelevel" %%% "jawn-parser" % "1.6.0")
lazy val jawnAst = Def.setting("org.typelevel" %%% "jawn-ast" % "1.6.0")
lazy val jython = Def.setting("org.python" % "jython-standalone" % "2.7.4")
lazy val http4sBlaze = Def.setting("org.http4s" %% "http4s-blaze-client" % "0.23.17")
lazy val http4sBlaze =
Def.setting("org.http4s" %% "http4s-blaze-client" % "0.23.17")
lazy val http4sCore = Def.setting("org.http4s" %%% "http4s-core" % "0.23.30")
lazy val http4sEmber = Def.setting("org.http4s" %%% "http4s-ember-client" % "0.23.30")
lazy val http4sEmber =
Def.setting("org.http4s" %%% "http4s-ember-client" % "0.23.30")
lazy val munit = Def.setting("org.scalameta" %%% "munit" % "1.0.4")
lazy val munitScalaCheck =
Def.setting("org.scalameta" %%% "munit-scalacheck" % "1.0.0")
Expand Down
Loading