Uses the Guardian's setup-scala action to provide Java, Scala and s…

…bt, following the removal of sbt from Github's base images. See [prior example](guardian/amiable#738). Also adds a `.tool-versions` file specifying the version of Java to use in the action, and removes the old `.java-version` file because afaict it was only being used by the `setup-java` action that's been removed above.
guardian · Jan 6, 2025 · ccd8abf · ccd8abf
1 parent 981d7ca
commit ccd8abf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -32,12 +32,9 @@ jobs:
           cache-dependency-path: "./package-lock.json"
           node-version-file: ".nvmrc"
 
-      - name: Setup Java
-        uses: actions/setup-java@v4
-        with:
-          java-version-file: ".java-version"
-          distribution: "corretto"
-          cache: "sbt"
+      # See https://github.com/guardian/setup-scala
+      - name: Setup Java and sbt
+        uses: guardian/setup-scala@v1
 
       - name: Lint and test
         run: |

diff --git a/.java-version b/.java-version
diff --git a/.tool-versions b/.tool-versions
@@ -0,0 +1 @@
+java corretto-17.0.13