From 0e6026a5d8cf7830be8f75f1f9713de2affac209 Mon Sep 17 00:00:00 2001
From: Rachel Miles <74301289+codingWithRach@users.noreply.github.com>
Date: Tue, 22 Oct 2024 10:03:44 +0100
Subject: [PATCH 1/3] Add setup-scala to workflow

---
 .github/workflows/ci.yml | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b77fc7..ae503a5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,10 +15,6 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2.5.0
-    - name: Setup JDK
-      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # v3.6.0
-      with:
-        distribution: corretto
-        java-version: ${{ matrix.java }}
+    - uses: guardian/setup-scala@v1
     - name: Build and Test
       run: sbt +clean +compile +test

From c354f0091752d670438f692a668bceae56ebc246 Mon Sep 17 00:00:00 2001
From: Rachel Miles <74301289+codingWithRach@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:07:35 +0100
Subject: [PATCH 2/3] Revert to previous

---
 .github/workflows/ci.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ae503a5..1b77fc7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,10 @@ jobs:
     steps:
     - name: Checkout
       uses: actions/checkout@e2f20e631ae6d7dd3b768f56a5d2af784dd54791 # v2.5.0
-    - uses: guardian/setup-scala@v1
+    - name: Setup JDK
+      uses: actions/setup-java@de1bb2b0c5634f0fc4438d7aa9944e68f9bf86cc # v3.6.0
+      with:
+        distribution: corretto
+        java-version: ${{ matrix.java }}
     - name: Build and Test
       run: sbt +clean +compile +test

From ff61fc9b55f9064de08213957c5f15dd9046a20c Mon Sep 17 00:00:00 2001
From: Rachel Miles <74301289+codingWithRach@users.noreply.github.com>
Date: Tue, 22 Oct 2024 11:11:34 +0100
Subject: [PATCH 3/3] Add setup-sbt to workflow

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 1b77fc7..1264808 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,5 +20,6 @@ jobs:
       with:
         distribution: corretto
         java-version: ${{ matrix.java }}
+    - uses: sbt/setup-sbt@v1.1.0
     - name: Build and Test
       run: sbt +clean +compile +test