Skip to content

Commit

Permalink
Merge pull request #362 from scala-steward/update/scalafmt-core-3.8.1
Browse files Browse the repository at this point in the history
build(deps): bump scalafmt-core from 3.8.0 to 3.8.1
  • Loading branch information
tkrs authored Apr 25, 2024
2 parents 961438d + 114299e commit 236c713
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 13 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.2
1dd765d97b095e1b691f2c2fffef70642e0d5a59

# Scala Steward: Reformat with scalafmt 3.8.1
3fa394ace9febc673f43b4274f9a749625c017bb
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.0
version = 3.8.1
maxColumn = 120
assumeStandardLibraryStripMargin = true

Expand Down
23 changes: 11 additions & 12 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -102,18 +102,17 @@ 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 236c713

Please sign in to comment.