From 8a398b1dc998e565826522d5ab2a1fb63625e71d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bendix=20S=C3=A4ltz?= <bendix@saeltz.de>
Date: Sat, 13 Apr 2024 23:26:19 +0200
Subject: [PATCH] Migrate from setup-scala to setup-java action (#833)

* Migrate from setup-scala to setup-java action

* Update master-codecov.yml

* Update pr-checks.yml
---
 .github/workflows/master-codecov.yml |  5 +++--
 .github/workflows/master-release.yml |  5 +++--
 .github/workflows/pr-checks.yml      | 12 +++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/master-codecov.yml b/.github/workflows/master-codecov.yml
index a97faf7f..f2eef68d 100644
--- a/.github/workflows/master-codecov.yml
+++ b/.github/workflows/master-codecov.yml
@@ -8,9 +8,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.11
+          distribution: adopt
+          java-version: 11
       - uses: actions/cache@v4
         with:
           path: ~/.ivy2/cache
diff --git a/.github/workflows/master-release.yml b/.github/workflows/master-release.yml
index 1b9d2f28..4979a49b 100644
--- a/.github/workflows/master-release.yml
+++ b/.github/workflows/master-release.yml
@@ -10,9 +10,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - run: git fetch --prune --unshallow
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.8
+          distribution: adopt
+          java-version: 8
       - run: |
           sudo apt-get update && sudo apt-get -y install gnupg2
           mkdir ~/.gnupg && chmod 700 ~/.gnupg
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 63d41a02..b91332eb 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -8,7 +8,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: [8, 11]
+        java: ['8', '11']
         scala:
           - 2.12.18
           - 2.12.19
@@ -16,9 +16,10 @@ jobs:
           - 2.13.13
     steps:
       - uses: actions/checkout@v4
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.${{matrix.java}}
+          distribution: adopt
+          java-version: ${{matrix.java}}
       - uses: actions/cache@v4
         with:
           path: ~/.ivy2/cache
@@ -35,9 +36,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: olafurpg/setup-scala@v14
+      - uses: actions/setup-java@v4
         with:
-          java-version: adopt@1.11
+          distribution: adopt
+          java-version: 11
       - uses: actions/cache@v4
         with:
           path: ~/.ivy2/cache