Skip to content

Commit 97b02da

Browse files
committed
run everything on java 25
1 parent 40ada42 commit 97b02da

2 files changed

Lines changed: 21 additions & 10 deletions

File tree

.github/workflows/j3o-scan.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/setup-java@v5
3535
with:
3636
distribution: temurin
37-
java-version: '17'
37+
java-version: '25'
3838

3939
- name: Scan J3O assets
4040
run: ./gradlew :jme3-desktop:scanJ3O --console=plain

.github/workflows/main.yml

Lines changed: 20 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
uses: actions/setup-java@v5
7070
with:
7171
distribution: 'temurin'
72-
java-version: '21'
72+
java-version: '25'
7373
- name: Validate the Gradle wrapper
7474
uses: gradle/actions/wrapper-validation@v6.1.0
7575
- name: Run Checkstyle
@@ -96,7 +96,7 @@ jobs:
9696
uses: actions/setup-java@v5
9797
with:
9898
distribution: 'temurin'
99-
java-version: '21'
99+
java-version: '25'
100100
- name: Validate the Gradle wrapper
101101
uses: gradle/actions/wrapper-validation@v6.1.0
102102
- name: Run SpotBugs
@@ -120,6 +120,11 @@ jobs:
120120
contents: read
121121
steps:
122122
- uses: actions/checkout@v6
123+
- name: Setup the java environment
124+
uses: actions/setup-java@v5
125+
with:
126+
distribution: 'temurin'
127+
java-version: '25'
123128
- name: Start xvfb
124129
run: |
125130
Xvfb :99 -ac -screen 0 1024x768x16 &
@@ -163,7 +168,7 @@ jobs:
163168
uses: actions/setup-java@v5
164169
with:
165170
distribution: 'temurin'
166-
java-version: '17'
171+
java-version: '25'
167172

168173
- name: Setup the XCode version to 15.1.0
169174
uses: maxim-lobanov/setup-xcode@ed7a3b1fda3918c0306d1b724322adc0b8cc0a90 # v1.7.0
@@ -202,11 +207,11 @@ jobs:
202207
with:
203208
fetch-depth: 1
204209

205-
- name: Setup Java 17
210+
- name: Setup Java 25
206211
uses: actions/setup-java@v5
207212
with:
208213
distribution: temurin
209-
java-version: '17'
214+
java-version: '25'
210215

211216
- name: Check java version
212217
run: java -version
@@ -259,6 +264,12 @@ jobs:
259264
with:
260265
fetch-depth: 1
261266

267+
- name: Setup the java environment
268+
uses: actions/setup-java@v5
269+
with:
270+
distribution: 'temurin'
271+
java-version: ${{ matrix.jdk }}
272+
262273
- name: Download natives for android
263274
uses: actions/download-artifact@v8.0.1
264275
with:
@@ -453,12 +464,12 @@ jobs:
453464
with:
454465
fetch-depth: 1
455466

456-
# Setup jdk 21 used for building Maven-style artifacts
467+
# Setup jdk 25 used for building Maven-style artifacts
457468
- name: Setup the java environment
458469
uses: actions/setup-java@be666c2fcd27ec809703dec50e508c2fdc7f6654 # v5
459470
with:
460471
distribution: 'temurin'
461-
java-version: '21'
472+
java-version: '25'
462473

463474
- name: Download natives for android
464475
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
@@ -502,12 +513,12 @@ jobs:
502513
with:
503514
fetch-depth: 1
504515

505-
# Setup jdk 21 used for building Sonatype artifacts
516+
# Setup jdk 25 used for building Sonatype artifacts
506517
- name: Setup the java environment
507518
uses: actions/setup-java@v5
508519
with:
509520
distribution: 'temurin'
510-
java-version: '21'
521+
java-version: '25'
511522

512523
# Download all the stuff...
513524
- name: Download maven artifacts

0 commit comments

Comments
 (0)