Skip to content

Commit

Permalink
Merge pull request #1325 from scala-steward/update/scalafmt-core-3.8.4
Browse files Browse the repository at this point in the history
Update scalafmt-core to 3.8.4
  • Loading branch information
mergify[bot] authored Jan 16, 2025
2 parents b8bb019 + 2442280 commit 6cc7c48
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 6 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -1,2 +1,5 @@
# Scala Steward: Reformat with scalafmt 3.7.3
2ab9b53fc2fbe46fdffbed46271d3896d84ac880

# Scala Steward: Reformat with scalafmt 3.8.4
30c8262ff158d9bd48c9ba6b509e93078d08258f
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.8.3
version = 3.8.4
runner.dialect = scala213
maxColumn = 100
docstrings.style = keep
Expand Down
8 changes: 3 additions & 5 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ lazy val core = myCrossProject("core")
.enablePlugins(BuildInfoPlugin)
.settings(moduleName := projectName)
.settings(
libraryDependencies ++= {
libraryDependencies ++=
macroParadise(Compile).value ++ (
if (isScala3Setting.value)
Seq()
Expand All @@ -204,8 +204,7 @@ lazy val core = myCrossProject("core")
Seq("com.chuusai" %%% "shapeless" % shapelessVersion)
) ++ Seq(
"org.scalacheck" %%% "scalacheck" % scalaCheckVersion % Test
)
},
),
buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
buildInfoPackage := s"$rootPkg.internal"
)
Expand Down Expand Up @@ -465,7 +464,7 @@ lazy val compileSettings = Def.settings(
Compile / console / scalacOptions -= "-Ywarn-unused:imports",
Test / console / scalacOptions := (Compile / console / scalacOptions).value,
Seq(Compile, Test).map { config =>
(config / unmanagedSourceDirectories) ++= {
(config / unmanagedSourceDirectories) ++=
(config / unmanagedSourceDirectories).value.flatMap { dir: File =>
if (dir.getName != "scala") Seq(dir)
else
Expand All @@ -475,7 +474,6 @@ lazy val compileSettings = Def.settings(
case other => sys.error(s"unmanagedSourceDirectories for scalaVersion $other not set")
}
}
}
}
)

Expand Down

0 comments on commit 6cc7c48

Please sign in to comment.