Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

build(deps): Update scalafmt-core from 3.6.1 to 3.7.0 #1988

Merged
merged 3 commits into from
Jan 19, 2023
Merged

build(deps): Update scalafmt-core from 3.6.1 to 3.7.0 #1988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7b7f70
build(deps): Update scalafmt-core from 3.6.1 to 3.7.0
scala-center-steward[bot] Jan 19, 2023
938cf56
Reformat with scalafmt 3.7.0
scala-center-steward[bot] Jan 19, 2023
860b30c
Add 'Reformat with scalafmt 3.7.0' to .git-blame-ignore-revs
scala-center-steward[bot] Jan 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions .git-blame-ignore-revs
View file
Open in desktop
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
View file
Open in desktop
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
25 changes: 12 additions & 13 deletions integrations/sbt-bloop/src/main/scala/bloop/integrations/sbt/SbtBloop.scala
View file
Open in desktop
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