From ed78733c17f9ec78fa6bb7617ff6d920aad3acda Mon Sep 17 00:00:00 2001
From: "gu-scala-steward-public-repos[bot]"
 <108136057+gu-scala-steward-public-repos[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 12:05:48 +0000
Subject: [PATCH 1/2] Update sbt to 1.10.7

---
 project/build.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/project/build.properties b/project/build.properties
index e88a0d8..73df629 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -1 +1 @@
-sbt.version=1.10.6
+sbt.version=1.10.7

From 3d6b0f6d4b6086245c91ec6fe4fe4816a29649a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pascal=20Honor=C3=A9?= <pascal@alseyn.net>
Date: Sun, 12 Jan 2025 16:43:14 +0000
Subject: [PATCH 2/2] set up java and sbt

---
 .github/workflows/ci.yml | 7 ++-----
 .tool-versions           | 1 +
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 .tool-versions

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c466dc0..7dad900 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,11 +17,8 @@ jobs:
         with:
           role-to-assume: ${{ secrets.GU_RIFF_RAFF_ROLE_ARN }}
           aws-region: eu-west-1
-      - uses: actions/setup-java@v3
-        with:
-          distribution: 'corretto'
-          java-version: '11'
-          cache: sbt
+      - name: Setup Java and sbt
+        uses: guardian/setup-scala@v1
       - name: CI
         run: |
           LAST_TEAMCITY_BUILD=6410
diff --git a/.tool-versions b/.tool-versions
new file mode 100644
index 0000000..b4e8fc6
--- /dev/null
+++ b/.tool-versions
@@ -0,0 +1 @@
+java corretto-21
\ No newline at end of file