Merge branch 'main' into update/sbt-native-packager-1.10.4

.git-blame-ignore-revs

@@ -0,0 +1,2 @@
+# Scala Steward: Reformat with scalafmt 3.8.3
+ff29859b7afa6c0f5a5b90c96be6e75cdb098ef1

.github/workflows/CI.yml

@@ -60,7 +60,7 @@ jobs:
       ############################################################
 
       - name: Check out Repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Setup Java
         uses: actions/[email protected]
@@ -69,7 +69,7 @@ jobs:
           java-version: ${{ matrix.java_version }}
 
       - name: Install Node.js
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: ${{ matrix.node }}
 
@@ -108,7 +108,7 @@ jobs:
       ############################################################
 
       - name: Check out Repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
 
@@ -147,7 +147,7 @@ jobs:
       ############################################################
 
       - name: Check out Repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Setup Java
         uses: actions/[email protected]
@@ -160,7 +160,7 @@ jobs:
         if: matrix.os == 'macos-13'
 
       - name: Install Node.js
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: ${{ matrix.node }}
 

.github/workflows/nightly.yml

@@ -58,7 +58,7 @@ jobs:
       ############################################################
 
       - name: Check out Repository
-        uses: actions/checkout@v4.1.7
+        uses: actions/checkout@v4.2.2
 
       - name: Setup Java
         uses: actions/[email protected]
@@ -67,7 +67,7 @@ jobs:
           java-version: ${{ matrix.java_version }}
 
       - name: Install Node.js
-        uses: actions/setup-node@v4.0.4
+        uses: actions/setup-node@v4.1.0
         with:
           node-version: ${{ matrix.node }}
 

.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

build.sbt

@@ -45,7 +45,7 @@ lazy val commonSettings =
       "org.apache.daffodil" %% "daffodil-runtime1" % daffodilVer
     ),
     dependencyOverrides ++= Seq(
-      "org.apache.commons" % "commons-lang3" % "3.12.0"
+      "org.apache.commons" % "commons-lang3" % "3.17.0"
     ),
     fork := true, // needed to pass javaOptions to tests, for example
     licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")),
@@ -98,10 +98,10 @@ lazy val debugger = project
       "ch.qos.logback" % "logback-classic" % "1.2.11",
       "com.microsoft.java" % "com.microsoft.java.debug.core" % "0.34.0",
       // scala-steward:on
-      "co.fs2" %% "fs2-io" % "3.9.3",
+      "co.fs2" %% "fs2-io" % "3.9.4",
       "com.monovore" %% "decline-effect" % "2.4.1",
       "org.typelevel" %% "log4cats-slf4j" % "2.6.0",
-      "org.scalameta" %% "munit" % "0.7.29" % Test
+      "org.scalameta" %% "munit" % "1.0.2" % Test
     ),
     buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion, "daffodilVersion" -> daffodilVer),
     buildInfoPackage := "org.apache.daffodil.debugger.dap",

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
         }

package.json

@@ -96,7 +96,7 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "5.2.2",
     "vscode-extension-tester": "5.9.1",
-    "webpack": "5.88.2",
+    "webpack": "5.97.1",
     "webpack-cli": "5.1.4"
   },
   "extensionDependencies": [

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"

project/build.properties

@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sbt.version = 1.9.9
+sbt.version = 1.10.6

project/plugins.sbt

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
 addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4")
+addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.2")
 addSbtPlugin("org.musigma" % "sbt-rat" % "0.7.0")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
 addSbtPlugin("org.scala-sbt.plugins" % "sbt-xjc" % "0.10")