Merge branch 'main' into update/scala-library-2.12.20

.github/workflows/ci.yml

@@ -23,7 +23,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macos-12]
-        scala: [2.13.14]
+        scala: [2.13.15]
         java:
           - temurin@8
           - temurin@11
@@ -102,7 +102,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        scala: [2.13.14]
+        scala: [2.13.15]
         java: [temurin@8]
     runs-on: ${{ matrix.os }}
     steps:
@@ -154,12 +154,12 @@ jobs:
       - name: Setup sbt
         uses: sbt/setup-sbt@v1
 
-      - name: Download target directories (2.13.14)
+      - name: Download target directories (2.13.15)
         uses: actions/download-artifact@v4
         with:
-          name: target-${{ matrix.os }}-2.13.14-${{ matrix.java }}
+          name: target-${{ matrix.os }}-2.13.15-${{ matrix.java }}
 
-      - name: Inflate target directories (2.13.14)
+      - name: Inflate target directories (2.13.15)
         run: |
           tar xf targets.tar
           rm targets.tar

build.sbt

@@ -1,11 +1,11 @@
 val buildName = "jardiff"
 
 val scala212Version = "2.12.20"
-val scala213Version = "2.13.14"
+val scala213Version = "2.13.15"
 
 inThisBuild(Seq[Setting[_]](
   organization := "com.lightbend",
-  scalaVersion := "2.13.14",
+  scalaVersion := "2.13.15",
   startYear := Some(2017),
   organizationName := "Lightbend Inc. <https://www.lightbend.com>",
   licenses := List(("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt"))),
@@ -65,7 +65,7 @@ lazy val root = (
   )
 )
 
-val AsmVersion = "9.7"
+val AsmVersion = "9.7.1"
 
 lazy val core = project.
   settings(

project/build.properties

@@ -1 +1 @@
-sbt.version=1.10.1
+sbt.version=1.10.5

project/plugins.sbt

@@ -1,4 +1,4 @@
 addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.2.0")
 addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
 addSbtPlugin("com.github.sbt" % "sbt-github-actions" % "0.24.0")
-addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
+addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")