Merge pull request #184 from SethTisue/ci-tweak

Author: SethTisue

.github/workflows/ci.yml

@@ -10,16 +10,16 @@ jobs:
       fail-fast: false
       matrix:
         java: [8, 11, 17]
-        scala: [2.13.8, 3.1.3]
+        scala: [2.13.x, 3.x]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
       with:
         fetch-depth: 0
-    - uses: coursier/cache-action@v6
-    - uses: actions/setup-java@v2
+    - uses: actions/setup-java@v3
       with:
         distribution: temurin
         java-version: ${{matrix.java}}
+        cache: sbt
     - name: Test
       run: sbt ++${{matrix.scala}} test package

build.sbt

@@ -21,13 +21,13 @@ lazy val collectionContrib = crossProject(JVMPlatform, JSPlatform)
     Compile / compile / scalacOptions ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, _)) => Seq("-opt-warnings", "-Werror", "-Wconf:origin=scala.collection.IterableOps.toIterable:s")
-        case Some((3, _)) => Seq("-Xfatal-warnings", "-scala-output-version:3.0", "-Wconf:cat=deprecation:s")
+        case _            => Seq("-Xfatal-warnings", "-scala-output-version:3.0", "-Wconf:cat=deprecation:s")
       }
     },
     Compile / doc / scalacOptions ++= {
       CrossVersion.partialVersion(scalaVersion.value) match {
         case Some((2, _)) => Seq("-implicits", "-groups", "-nowarn")
-        case Some((3, _)) => Seq.empty
+        case _            => Seq.empty
       }
     },
     testOptions += Tests.Argument(TestFrameworks.JUnit, "-q", "-v", "-s", "-a"),