From 5cdb3c52484029dffb7a296bc2448eae49787e47 Mon Sep 17 00:00:00 2001
From: Lindsey Dew <1202622+lindseydew@users.noreply.github.com>
Date: Mon, 4 Nov 2024 16:25:57 +0000
Subject: [PATCH] Use setup scala

---
 .../ci-mobile-save-for-later-user-deletion.yaml        | 10 +++-------
 .github/workflows/ci-mobile-save-for-later.yaml        |  8 ++------
 .tool-versions                                         |  1 +
 3 files changed, 6 insertions(+), 13 deletions(-)
 create mode 100644 .tool-versions

diff --git a/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml b/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml
index 5295446..5929e30 100644
--- a/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml
+++ b/.github/workflows/ci-mobile-save-for-later-user-deletion.yaml
@@ -13,12 +13,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           aws-region: eu-west-1
-      - name: Set up JDK
-        uses: actions/setup-java@v3
-        with:
-          java-version: 21
-          distribution: corretto
-          cache: sbt
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - name: Run Tests & Create Artifacts
         run: sbt "project mobile-save-for-later-user-deletion" test assembly
@@ -32,4 +28,4 @@ jobs:
             mobile-save-for-later-user-deletion-cfn:
              - ./mobile-save-for-later-user-deletion/conf/cfn.yaml
             mobile-save-for-later-user-deletion:
-             - mobile-save-for-later-user-deletion/target/scala-2.13/mobile-save-for-later-user-deletion.jar
\ No newline at end of file
+             - mobile-save-for-later-user-deletion/target/scala-2.13/mobile-save-for-later-user-deletion.jar
diff --git a/.github/workflows/ci-mobile-save-for-later.yaml b/.github/workflows/ci-mobile-save-for-later.yaml
index c46c572..04d21f6 100644
--- a/.github/workflows/ci-mobile-save-for-later.yaml
+++ b/.github/workflows/ci-mobile-save-for-later.yaml
@@ -13,12 +13,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           aws-region: eu-west-1
-      - name: Set up JDK
-        uses: actions/setup-java@v4
-        with:
-          java-version: 21
-          distribution: corretto
-          cache: sbt
+      - name: Setup JDK and sbt
+        uses: guardian/setup-scala@v1
 
       - name: Run Tests and Create Artifacts
         run: sbt "project mobile-save-for-later" test assembly
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000..0ef52de
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+java corretto-21