Skip to content

Commit

Permalink
Merge pull request #1988 from scalacenter/update/scalafmt-core-3.7.0
Browse files Browse the repository at this point in the history
build(deps): Update scalafmt-core from 3.6.1 to 3.7.0
  • Loading branch information
tgodzik committed Jan 19, 2023
2 parents 5abae0d + 860b30c commit 063268c
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 14 deletions.
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

# Scala Steward: Reformat with scalafmt 3.6.1
77bc6a5845189a9659476d29fd7c02be5327ab8a

# Scala Steward: Reformat with scalafmt 3.7.0
938cf56606b4900cbd7679725441fbbbe979bcaf
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.0"
runner.dialect = scala213
maxColumn = 100
docstrings.style = Asterisk
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1092,21 +1092,20 @@ object BloopDefaults {
}

private final val allJson = sbt.GlobFilter("*.json")
private final val removeStaleProjects = {
allConfigDirs: Set[File] =>
{ (state: State, generatedFiles: Set[Option[File]]) =>
val logger = state.globalLogging.full
val allConfigs =
allConfigDirs.flatMap(configDir => sbt.PathFinder(configDir).*(allJson).get)
allConfigs.diff(generatedFiles.flatMap(_.toList)).foreach { configFile =>
if (configFile.getName() == "bloop.settings.json") ()
else {
sbt.IO.delete(configFile)
logger.warn(s"Removed stale $configFile")
}
private final val removeStaleProjects = { allConfigDirs: Set[File] =>
{ (state: State, generatedFiles: Set[Option[File]]) =>
val logger = state.globalLogging.full
val allConfigs =
allConfigDirs.flatMap(configDir => sbt.PathFinder(configDir).*(allJson).get)
allConfigs.diff(generatedFiles.flatMap(_.toList)).foreach { configFile =>
if (configFile.getName() == "bloop.settings.json") ()
else {
sbt.IO.delete(configFile)
logger.warn(s"Removed stale $configFile")
}
state
}
state
}
}

def bloopGlobalUniqueIdTask: Def.Initialize[String] = Def.setting {
Expand Down

0 comments on commit 063268c

Please sign in to comment.