Use java 21

samolego · Jul 30, 2024 · 99c6aed · 99c6aed
1 parent 6667656
commit 99c6aed
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 17 deletions.
diff --git a/.github/workflows/fabric-build.yml b/.github/workflows/fabric-build.yml
@@ -8,13 +8,7 @@ on: [pull_request, push]
 
 jobs:
   build:
-    strategy:
-      matrix:
-        # Use these Java versions
-        java: [23] # Latest version
-        # and run on both Linux and Windows
-        os: [ubuntu-20.04, windows-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/cache@v2
         with:
@@ -29,18 +23,16 @@ jobs:
         uses: actions/checkout@v2
       - name: validate gradle wrapper
         uses: gradle/wrapper-validation-action@v1
-      - name: setup jdk ${{ matrix.java }}
-        uses: actions/setup-java@v1
+      - name: setup jdk
+        uses: actions/setup-java@v4
         with:
-          java-version: ${{ matrix.java }}
+          java-version: 21
       - name: make gradle wrapper executable
-        if: ${{ runner.os != 'Windows' }}
         run: chmod +x ./gradlew
       - name: build
         run: ./gradlew fabric:build
       - name: capture build artifacts
-        if: ${{ runner.os == 'Linux' }}
         uses: actions/upload-artifact@v2
         with:
           name: Artifacts
-          path: fabric/build/libs/
+          path: build/libs/
diff --git a/.github/workflows/fabric-release.yml b/.github/workflows/fabric-release.yml
@@ -24,9 +24,9 @@ jobs:
             gradle-
       - uses: actions/checkout@v2
       - name: Set up JDK
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v4
         with:
-          java-version: 23
+          java-version: 21
 
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew

diff --git a/.github/workflows/javadoc-snapshot.yml b/.github/workflows/javadoc-snapshot.yml
@@ -14,7 +14,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 23
+          java-version: 21
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle

diff --git a/.github/workflows/javadoc.yml b/.github/workflows/javadoc.yml
@@ -18,7 +18,7 @@ jobs:
       - name: Set up JDK
         uses: actions/setup-java@v1
         with:
-          java-version: 23
+          java-version: 21
       - name: Grant execute permission for gradlew
         run: chmod +x gradlew
       - name: Build with Gradle