Skip to content

Commit b2a9504

Browse files
authored
Merge pull request #547 from scalacenter/update/scalafmt-core-3.8.4
Update scalafmt-core to 3.8.4
2 parents ba663bb + 7b489e9 commit b2a9504

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed

.git-blame-ignore-revs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@
33

44
# Scala Steward: Reformat with scalafmt 3.8.2
55
006fe434b9a92eebadcea4a7f8f423484c955a19
6+
7+
# Scala Steward: Reformat with scalafmt 3.8.4
8+
de03e98afc7ec386587569627f1bd8d2455289b3

.scalafmt.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version = "3.8.3"
1+
version = "3.8.4"
22
runner.dialect = scala213
33
maxColumn = 120
44
align.preset = most

build.sbt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,15 +186,14 @@ lazy val `scalafix-output` = project
186186
publish / skip := true,
187187
crossScalaVersions := List(V.scala213, V.scala3),
188188
scalacOptions ++= (if (scalaVersion.value.startsWith("3")) Seq("-Ykind-projector") else Seq()),
189-
libraryDependencies ++= {
189+
libraryDependencies ++=
190190
Seq("org.typelevel" %% "cats-core" % V.catsCore, "dev.zio" %% "zio" % V.zio) ++
191191
(CrossVersion.partialVersion(scalaVersion.value) match {
192192
case Some((2, 13)) =>
193193
Seq(compilerPlugin(("org.typelevel" %% "kind-projector" % V.kindProjector).cross(CrossVersion.full)))
194194
case Some((3, _)) => Seq()
195195
case _ => Seq()
196-
})
197-
},
196+
}),
198197
buildInfoKeys := Seq[BuildInfoKey](name)
199198
)
200199
.enablePlugins(BuildInfoPlugin)

plugin/src/sbt-test/sbt-scala3-migrate/unresolved-dependencies/build.sbt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ lazy val `unresolved-dependencies` = project
66
"org.typelevel" %% "cats-core" % V.catsCore,
77
compilerPlugin("org.typelevel" % "kind-projector" % V.kindProjector cross CrossVersion.full)
88
),
9-
TaskKey[Unit]("checkFallback") := {
9+
TaskKey[Unit]("checkFallback") :=
1010
assert(scalaVersion.value == V.scala213, s"Wrong scala version ${scalaVersion.value}. Expected ${V.scala213}")
11-
}
1211
)
1312

1413
lazy val V = new {

0 commit comments

Comments
 (0)