Ensure sbt is properly installed in GitHub actions

.github/workflows/ci.yml

@@ -33,13 +33,9 @@ jobs:
           cache: 'npm'
           cache-dependency-path: 'cdk/package-lock.json'
 
-      # See https://github.com/actions/setup-java
-      - name: Setup Java 11
-        uses: actions/[email protected]
-        with:
-          java-version: '11'
-          distribution: 'corretto'
-          cache: 'sbt'
+      # See https://github.com/guardian/setup-java
+      - name: Setup Java and sbt
+        uses: guardian/setup-scala@v1
 
       - run: |
           LAST_TEAMCITY_BUILD=1007

.github/workflows/sbt-dependency-graph.yaml

@@ -12,15 +12,11 @@ jobs:
       - name: Checkout branch
         id: checkout
         uses: actions/checkout@eef61447b9ff4aafe5dcd4e0bbf5d482be7e7871 # v4.2.1
-      - name: Install Java
-        id: java
-        uses: actions/setup-java@b36c23c0d998641eff861008f374ee103c25ac73 # v4.2.0
-        with:
-          distribution: corretto
-          java-version: 17
-      - name: Install sbt
-        id: sbt
-        uses: sbt/setup-sbt@8a071aa780c993c7a204c785d04d3e8eb64ef272 # v1.1.0
+
+      # See https://github.com/guardian/setup-java
+      - name: Setup Java and sbt
+        uses: guardian/setup-scala@v1
+
       - name: Submit dependencies
         id: submit
         uses: scalacenter/sbt-dependency-submission@64084844d2b0a9b6c3765f33acde2fbe3f5ae7d3 # v3.1.0

.tool-versions

@@ -0,0 +1 @@
+java corretto-11.0.25.9.1