From 5ca7fb0e3e6d1eda5da749864c2c1f04c973cac6 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Tue, 14 Jan 2025 15:52:41 +0000
Subject: [PATCH 1/3] Update scalafmt-core to 3.8.4
---
.scalafmt.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.scalafmt.conf b/.scalafmt.conf
index aa39efda..ccc218cf 100644
--- a/.scalafmt.conf
+++ b/.scalafmt.conf
@@ -1,4 +1,4 @@
-version = "3.8.3"
+version = "3.8.4"
align.preset = none
align.openParenCallSite = false
From ae16e0c78c2462b224f267bb518270a46cbc9786 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Tue, 14 Jan 2025 15:52:59 +0000
Subject: [PATCH 2/3] Reformat with scalafmt 3.8.4
Executed command: scalafmt --non-interactive
---
build.mill | 2 +-
os/src/FileOps.scala | 8 ++++++--
os/src/ProcessOps.scala | 4 +++-
os/watch/src/FSEventsWatcher.scala | 4 +++-
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/build.mill b/build.mill
index 5e9f3e2a..0ac0db82 100644
--- a/build.mill
+++ b/build.mill
@@ -184,7 +184,7 @@ object os extends Module {
object testJarWriter extends JavaModule
object testJarReader extends JavaModule
object testJarExit extends JavaModule
- object testSpawnExitHook extends ScalaModule{
+ object testSpawnExitHook extends ScalaModule {
def scalaVersion = OsJvmModule.this.scalaVersion()
def moduleDeps = Seq(OsJvmModule.this)
}
diff --git a/os/src/FileOps.scala b/os/src/FileOps.scala
index c0ee81ea..efc397f3 100644
--- a/os/src/FileOps.scala
+++ b/os/src/FileOps.scala
@@ -339,11 +339,15 @@ object remove extends Function1[Path, Boolean] {
if (Files.isDirectory(nioTarget, LinkOption.NOFOLLOW_LINKS)) {
for (p <- walk.stream(target, preOrder = false)) {
try remove(p)
- catch { case e: Throwable if ignoreErrors => /*ignore*/ }
+ catch {
+ case e: Throwable if ignoreErrors => /*ignore*/
+ }
}
}
try Files.delete(nioTarget)
- catch { case e: Throwable if ignoreErrors => /*ignore*/ }
+ catch {
+ case e: Throwable if ignoreErrors => /*ignore*/
+ }
}
}
}
diff --git a/os/src/ProcessOps.scala b/os/src/ProcessOps.scala
index 6175e87c..7ca90ba5 100644
--- a/os/src/ProcessOps.scala
+++ b/os/src/ProcessOps.scala
@@ -332,7 +332,9 @@ case class proc(command: Shellable*) {
override def run(): Unit = {
while (proc.wrapped.isAlive) Thread.sleep(1)
try Runtime.getRuntime().removeShutdownHook(t)
- catch { case e: Throwable => /*do nothing*/ }
+ catch {
+ case e: Throwable => /*do nothing*/
+ }
}
}
)
diff --git a/os/watch/src/FSEventsWatcher.scala b/os/watch/src/FSEventsWatcher.scala
index d41b092e..afa334b1 100644
--- a/os/watch/src/FSEventsWatcher.scala
+++ b/os/watch/src/FSEventsWatcher.scala
@@ -32,7 +32,9 @@ class FSEventsWatcher(
else {
existingFolders.add(p)
try os.walk.stream(p).foreach(nestedPaths.append(_))
- catch { case e: Throwable => /*do nothing*/ }
+ catch {
+ case e: Throwable => /*do nothing*/
+ }
}
}
onEvent((paths ++ nestedPaths).toSet)
From 22c19b6a7690c740e3a838cabec565fa1ab02108 Mon Sep 17 00:00:00 2001
From: Scala Steward <scala_steward@virtuslab.com>
Date: Tue, 14 Jan 2025 15:52:59 +0000
Subject: [PATCH 3/3] Add 'Reformat with scalafmt 3.8.4' to
.git-blame-ignore-revs
---
.git-blame-ignore-revs | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 6ebecf67..5fd95ee5 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -4,3 +4,6 @@ b049841d5707d5bd87be516d8cda7be2a7585eae
# Reformatted test code
e437d63c40713e0645a4895bbe5a0fc565cd56db
+
+# Scala Steward: Reformat with scalafmt 3.8.4
+ae16e0c78c2462b224f267bb518270a46cbc9786