From 326da7a8144525348f30a79c02b686cdcf50643f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:16:22 +0000 Subject: [PATCH 1/3] Update scalafmt-core to 3.7.17 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 8ae105bc..5636c671 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.7.4 +version = 3.7.17 maxColumn = 100 project.git = true project.excludeFilters = [ /sbt-test/, /input_sources/, /contraband-scala/ ] From 51ff6ed032bdebd73d089cc9ecf8f062b53bc07d Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:16:43 +0000 Subject: [PATCH 2/3] Reformat with scalafmt 3.7.17 Executed command: scalafmt --non-interactive --- .../scala/sbt/internal/nio/FileTreeRepositorySpec.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/io/src/test/scala/sbt/internal/nio/FileTreeRepositorySpec.scala b/io/src/test/scala/sbt/internal/nio/FileTreeRepositorySpec.scala index 59874b89..0344476f 100644 --- a/io/src/test/scala/sbt/internal/nio/FileTreeRepositorySpec.scala +++ b/io/src/test/scala/sbt/internal/nio/FileTreeRepositorySpec.scala @@ -211,8 +211,8 @@ class FileTreeRepositorySpec extends AnyFlatSpec with Matchers { c.ls(dir.toGlob / RecursiveGlob).toSet shouldBe (files ++ subdirs).toSet } - // This is failing on GitHub Action - /* + // This is failing on GitHub Action + /* withThread("file-deletion-thread") { subdirs.foreach(p => IO.delete(p.toFile)) } { @@ -221,7 +221,7 @@ class FileTreeRepositorySpec extends AnyFlatSpec with Matchers { } c.ls(dir.toGlob / AnyPath) shouldBe Symbol("empty") } - */ + */ } } From f5bb4b0333a65c8f6c73508a73dc0919b0898c6f Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sun, 3 Nov 2024 18:16:43 +0000 Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.7.17' to .git-blame-ignore-revs --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 00000000..ae6d753e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.7.17 +51ff6ed032bdebd73d089cc9ecf8f062b53bc07d