Merge branch 'main' into update/scalatest-3.2.20

Author: blemale

.github/workflows/ci.yml

@@ -5,13 +5,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        scala: ["2.12.20", "2.13.15", "3.3.7"]
+        scala: ["2.12.21", "2.13.18", "3.3.7"]
     steps:
       - uses: actions/checkout@v2
       - uses: coursier/cache-action@v6
-      - uses: olafurpg/setup-scala@v11
+      - uses: actions/setup-java@v4
         with:
-          java-version: zulu@1.11
+          java-version: 11
+          distribution: zulu
+      - uses: sbt/setup-sbt@v1
       - run: sbt ++${{ matrix.scala }} clean scalafmtSbtCheck scalafmtCheck test doc
         if: startsWith(matrix.scala, '3')
       - run: sbt ++${{ matrix.scala }} clean scalafmtSbtCheck scalafmtCheck coverage test doc coverageReport coveralls

.github/workflows/release.yml

@@ -10,9 +10,11 @@ jobs:
       - uses: actions/checkout@v2.3.4
         with:
           fetch-depth: 0
-      - uses: olafurpg/setup-scala@v11
+      - uses: actions/setup-java@v4
         with:
-          java-version: zulu@1.11
+          java-version: 11
+          distribution: zulu
+      - uses: sbt/setup-sbt@v1
       - run: sbt ci-release
         env:
           PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}

.scalafmt.conf

@@ -1,4 +1,4 @@
-version = 3.10.7
+version = 3.11.0
 runner.dialect = scala212
 fileOverride {
   "glob:**.sbt" {

build.sbt

@@ -20,14 +20,14 @@ inThisBuild(
 )
 
 scalaVersion       := "2.12.20"
-crossScalaVersions := Seq("2.12.20", "2.13.15", "3.3.7")
+crossScalaVersions := Seq("2.12.21", "2.13.18", "3.3.7")
 
 libraryDependencies ++=
   Seq(
     "com.github.ben-manes.caffeine" % "caffeine" % CaffeineVersion.value,
     "org.scala-lang.modules"  %% "scala-java8-compat" % "1.0.2",
     "com.google.code.findbugs" % "jsr305"             % "3.0.2"  % "provided",
-    "org.scalactic"           %% "scalactic"          % "3.2.19" % "test",
+    "org.scalactic"           %% "scalactic"          % "3.2.20" % "test",
     "org.scalatest"           %% "scalatest"          % "3.2.20" % "test"
   )
 

project/plugins.sbt

@@ -1,8 +1,8 @@
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.2.2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
 
 addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15")
 
-addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
+addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.0")
 
 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")