Skip to content

Commit f122d13

Browse files
authored
Support Java 25 and 26 (#583)
* Java 26 * add dynamic all-checks-passed * Support 21, 25, and 26 * 25 and 26 only * fix formatting
1 parent 3b54b49 commit f122d13

4 files changed

Lines changed: 23 additions & 5 deletions

File tree

.github/workflows/daily-standings.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
timeout-minutes: 3
1414
strategy:
1515
matrix:
16-
java-version: [ 25 ]
16+
java-version: [ 26 ]
1717
os: [ ubuntu-latest ]
1818

1919
steps:

.github/workflows/gradle.yml

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
runs-on: ubuntu-latest
1111
strategy:
1212
matrix:
13-
java-version: [ 25 ]
13+
java-version: [ 25, 26 ]
1414
os: [ ubuntu-latest, macos-latest, windows-latest ]
1515

1616
steps:
@@ -29,7 +29,7 @@ jobs:
2929
- name: Run Gradle build
3030
env:
3131
SPRING_PROFILES_ACTIVE: test
32-
run: ./gradlew build --parallel --configuration-cache
32+
run: ./gradlew build --parallel --configuration-cache -PjavaVersion=${{ matrix.java-version }}
3333

3434
- name: Generate file
3535
run: |
@@ -58,3 +58,17 @@ jobs:
5858
echo "file 1 is smaller"
5959
exit 1
6060
fi
61+
62+
all-checks-passed:
63+
runs-on: ubuntu-latest
64+
needs: [ build ]
65+
if: always()
66+
steps:
67+
- name: Check status of all required jobs
68+
run: |
69+
if [[ "${{ contains(needs.*.result, 'failure') ||
70+
contains(needs.*.result, 'cancelled') }}" == "true" ]]; then
71+
echo "One or more dynamic checks failed."
72+
exit 1
73+
fi
74+
echo "All checks passed!"

build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,13 @@ plugins {
88
group = "com.trap-scoring"
99
version = "10.0.0"
1010

11+
val targetJavaVersion = providers.gradleProperty("javaVersion")
12+
.orElse(libs.versions.java)
13+
.map { it.toInt() }
14+
1115
java {
1216
toolchain {
13-
languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get().toInt()))
17+
languageVersion.set(targetJavaVersion.map { JavaLanguageVersion.of(it) })
1418
}
1519
}
1620

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[versions]
2-
java = "25"
2+
java = "26"
33
springBoot = "4.1.0-RC1"
44
poi = "5.5.1"
55
opencsv = "5.12.0"

0 commit comments

Comments
 (0)