Use setup-java for SBT

zio · Nov 5, 2024 · 9afb89d · 9afb89d
1 parent 14a9b0a
commit 9afb89d
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 14 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,8 +19,12 @@ jobs:
     steps:
       - name: Checkout current branch
         uses: actions/checkout@v3.3.0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v14
+      - name: Setup Java
+        uses: actions/setup-java@v4.5.0
+        with:
+          distribution: temurin
+          java-version: 11
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Check Document Generation
@@ -34,10 +38,12 @@ jobs:
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v14
+      - name: Setup Java
+        uses: actions/setup-java@v4.5.0
         with:
-          java-version: 'adopt@1.11'
+          distribution: temurin
+          java-version: 11
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Check formatting
@@ -51,18 +57,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        java: ['adopt@1.11', 'adopt@1.21']
+        java: ['11', '21']
         scala: ['2.12.20', '2.13.15', '3.3.4']
         platform: ['JS', 'JVM', 'Native']
     steps:
       - name: Checkout current branch
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v14
+      - name: Setup Java
+        uses: actions/setup-java@v4.5.0
         with:
+          distribution: temurin
           java-version: ${{ matrix.java }}
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Run JS tests
@@ -95,10 +103,12 @@ jobs:
         uses: actions/checkout@v3.3.0
         with:
           fetch-depth: 0
-      - name: Setup Scala and Java
-        uses: olafurpg/setup-scala@v14
+      - name: Setup Java
+        uses: actions/setup-java@v4.5.0
         with:
-          java-version: 'adopt@1.11'
+          distribution: temurin
+          java-version: 11
+          check-latest: true
       - name: Cache scala dependencies
         uses: coursier/cache-action@v6
       - name: Release artifacts

diff --git a/.github/workflows/site.yml b/.github/workflows/site.yml
@@ -22,7 +22,7 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -39,7 +39,7 @@ jobs:
       with:
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17
@@ -64,7 +64,7 @@ jobs:
         ref: ${{ github.head_ref }}
         fetch-depth: '0'
     - name: Setup Scala
-      uses: actions/setup-java@v3.9.0
+      uses: actions/setup-java@v4.5.0
       with:
         distribution: temurin
         java-version: 17