From 0178b5c14362fef760e4eb4f186b76df81aa5491 Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Wed, 20 Jul 2022 09:59:00 -0700
Subject: [PATCH 1/3] use new sbt 1.7 feature to simplify Actions config

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index afcfa94..76bf676 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,7 +10,7 @@ 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

From 1770a87ec10c5d5742b897a17b757cd450d6b7bc Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Wed, 20 Jul 2022 09:59:14 -0700
Subject: [PATCH 2/3] Actions: upgrade to setup-java@v3

---
 .github/workflows/ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 76bf676..d174381 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,10 +16,10 @@ jobs:
     - 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

From 17ff3fe8db383289de4039117a957abd723ddf4d Mon Sep 17 00:00:00 2001
From: Seth Tisue <seth@tisue.net>
Date: Wed, 20 Jul 2022 10:04:37 -0700
Subject: [PATCH 3/3] build.sbt: avoid exhaustivity warning

---
 build.sbt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index 07f2f8b..a765447 100644
--- a/build.sbt
+++ b/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"),