From d9a589f1cdf25a608da18ab4ca1103048d4d46f8 Mon Sep 17 00:00:00 2001 From: Kelvin Chappell Date: Fri, 20 Dec 2024 11:55:15 +0000 Subject: [PATCH 1/2] Include setup-scala step in CI --- .github/workflows/ci.yml | 7 +------ .tool-versions | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) create mode 100644 .tool-versions diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f9e8e2a..888df81 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,12 +15,7 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 - - name: Setup JDK - uses: actions/setup-java@v3 - with: - distribution: temurin - java-version: 11 - cache: sbt + - uses: guardian/setup-scala@v1 - name: Build and Test env: PROUT_GITHUB_ACCESS_TOKEN: ${{ secrets.PROUT_GITHUB_ACCESS_TOKEN }} diff --git a/.tool-versions b/.tool-versions new file mode 100644 index 0000000..f1faf76 --- /dev/null +++ b/.tool-versions @@ -0,0 +1 @@ +java corretto-21.0.5.11.1 From 034508bae65f9fd87a3e68f9eba9cd7a65b356c1 Mon Sep 17 00:00:00 2001 From: Kelvin Chappell Date: Fri, 20 Dec 2024 13:34:59 +0000 Subject: [PATCH 2/2] Use Java 11 to minimise the change. --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index f1faf76..58dcdfd 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1 +1 @@ -java corretto-21.0.5.11.1 +java corretto-11.0.25.9.1