Skip to content

Commit

Permalink
Merge pull request #300 from scala-steward/update/scalafmt-core-3.7.2
Browse files Browse the repository at this point in the history
build(deps): bump scalafmt-core from 3.6.1 to 3.7.2
  • Loading branch information
tkrs committed Mar 8, 2023
2 parents 8b2383b + 4963801 commit 0e9e82a
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 12 deletions.
2 changes: 2 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Scala Steward: Reformat with scalafmt 3.7.2
1dd765d97b095e1b691f2c2fffef70642e0d5a59
2 changes: 1 addition & 1 deletion .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = 3.6.1
version = 3.7.2
maxColumn = 120
assumeStandardLibraryStripMargin = true

Expand Down
23 changes: 12 additions & 11 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -102,17 +102,18 @@ lazy val sharedSettings = Seq(
lazy val crossVersionSharedSources =
Seq(Compile, Test).map { sc =>
(sc / unmanagedSourceDirectories) ++= {
(sc / unmanagedSourceDirectories).value.flatMap { dir: File =>
if (dir.getName != "scala") Seq(dir)
else
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, n)) =>
Seq(new File(dir.getPath + "_3"))
case Some((2, n)) if n >= 13 =>
Seq(new File(dir.getPath + "_2"), new File(dir.getPath + "_2.13+"))
case s =>
Seq(new File(dir.getPath + "_2"), new File(dir.getPath + "_2.12-"))
}
(sc / unmanagedSourceDirectories).value.flatMap {
dir: File =>
if (dir.getName != "scala") Seq(dir)
else
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, n)) =>
Seq(new File(dir.getPath + "_3"))
case Some((2, n)) if n >= 13 =>
Seq(new File(dir.getPath + "_2"), new File(dir.getPath + "_2.13+"))
case s =>
Seq(new File(dir.getPath + "_2"), new File(dir.getPath + "_2.12-"))
}
}
}
}
Expand Down

0 comments on commit 0e9e82a

Please sign in to comment.