From 5f1f01fa78d9eca3c6dfca57cfe629b9c8f6f2c8 Mon Sep 17 00:00:00 2001
From: Chris Birchall <chris.birchall@47deg.com>
Date: Wed, 11 Dec 2024 14:33:27 +0000
Subject: [PATCH 1/4] Use more recent versions of Java in CI

---
 .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 16cc0c5..0bfc37c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
           - 3.3.3
           - 3.4.2
         java:
-          - 1.8
           - 1.11
+          - 1.21
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

From 5bb367de92b39fb9dafcfee3175e415b5469178b Mon Sep 17 00:00:00 2001
From: Chris Birchall <chris.birchall@47deg.com>
Date: Wed, 11 Dec 2024 14:53:03 +0000
Subject: [PATCH 2/4] Switch to setup-java action

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0bfc37c..79c8fcb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,12 +30,11 @@ jobs:
           fetch-depth: 0
 
       - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
+        uses: actions/setup-java@v4
         with:
-          java-version: adopt@${{ matrix.java }}
-
-      - name: Cache sbt
-        uses: coursier/cache-action@v6
+          distribution: 'adopt'
+          java-version: ${{ matrix.java }}
+          cache: 'sbt'
 
       - name: Test
         run: |

From 0b48f9ec74d34608b9553a0f3066bb69d7244e79 Mon Sep 17 00:00:00 2001
From: Chris Birchall <chris.birchall@47deg.com>
Date: Wed, 11 Dec 2024 15:07:01 +0000
Subject: [PATCH 3/4] Fix Java versions

---
 .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 79c8fcb..27bacc8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,8 +20,8 @@ jobs:
           - 3.3.3
           - 3.4.2
         java:
-          - 1.11
-          - 1.21
+          - 11
+          - 21
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

From 44b26108b5596ea3872df0f87ecee076adbdc34b Mon Sep 17 00:00:00 2001
From: Chris Birchall <chris.birchall@47deg.com>
Date: Wed, 11 Dec 2024 15:48:59 +0000
Subject: [PATCH 4/4] Scala 2.12.15 doesn't like Java 21?

That's quite surprising
---
 .github/workflows/ci.yml      | 2 +-
 .github/workflows/release.yml | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 27bacc8..6d5337c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
           - 3.4.2
         java:
           - 11
-          - 21
+          - 17
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 3ca4418..7c395b8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -15,10 +15,11 @@ jobs:
           fetch-depth: 0 # fetch all tags to make sbt-dynver work properly
 
       - name: Setup Java and Scala
-        uses: olafurpg/setup-scala@v13
-
-      - name: Cache sbt
-        uses: coursier/cache-action@v6
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'adopt'
+          java-version: 17
+          cache: 'sbt'
 
       - name: Publish
         run: sbt ci-release