From 91b54024d2b02ff92abc59f863ce540b7fe250ca Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 1 Aug 2024 00:27:23 +0000 Subject: [PATCH] Update scalafmt-core to 3.8.3 - Reformat with scalafmt 3.8.3 - Executed command: scalafmt --non-interactive - Add 'Reformat with scalafmt 3.8.3' to .git-blame-ignore-revs - Add .git-blame-ignore-revs to Rat.scala --- .git-blame-ignore-revs | 2 ++ .scalafmt.conf | 2 +- .../main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala | 2 +- project/Rat.scala | 4 +++- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .git-blame-ignore-revs diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs new file mode 100644 index 000000000..3a086b35e --- /dev/null +++ b/.git-blame-ignore-revs @@ -0,0 +1,2 @@ +# Scala Steward: Reformat with scalafmt 3.8.3 +ff29859b7afa6c0f5a5b90c96be6e75cdb098ef1 diff --git a/.scalafmt.conf b/.scalafmt.conf index 0a5b85510..273cdd49f 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -version = "3.7.17" +version = "3.8.3" maxColumn = 120 rewrite.rules = [SortImports, RedundantBraces] runner.dialect = scala212 diff --git a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala index 8b61078b0..1d4de9f14 100644 --- a/debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala +++ b/debugger/src/main/scala/org.apache.daffodil.debugger.dap/DAPodil.scala @@ -485,7 +485,7 @@ object DAPodil extends IOApp { .as(ExitCode.Success) .recoverWith { // format: off - case _: SocketTimeoutException => + case _: SocketTimeoutException => Logger[IO].warn(s"timed out listening for connection on $uri, exiting").as(ExitCode.Error) // format: on } diff --git a/project/Rat.scala b/project/Rat.scala index dfeb3f6ea..25a01eaa7 100644 --- a/project/Rat.scala +++ b/project/Rat.scala @@ -56,7 +56,9 @@ object Rat { // svelte icons/fonts file("src/svelte/src/resources/icons/material-icons.woff2"), file("src/svelte/src/resources/fonts/SpaceGrotesk-Variable.woff2"), - file("src/svelte/src/resources/fonts/RedHatMono-Regular.woff2") + file("src/svelte/src/resources/fonts/RedHatMono-Regular.woff2"), + // scalafmt-core files + file(".git-blame-ignore-revs") ) lazy val MIT_LICENSE_NAME = "MIT License"