From cfc797cd7d8cd4afac2ef0d9e87107825ff06077 Mon Sep 17 00:00:00 2001 From: Matt Busche Date: Mon, 27 Apr 2026 22:28:38 -0500 Subject: [PATCH 1/5] Java 26 --- .github/workflows/daily-standings.yml | 2 +- .github/workflows/gradle.yml | 2 +- gradle/libs.versions.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/daily-standings.yml b/.github/workflows/daily-standings.yml index ce988ed..b66ca96 100644 --- a/.github/workflows/daily-standings.yml +++ b/.github/workflows/daily-standings.yml @@ -13,7 +13,7 @@ jobs: timeout-minutes: 3 strategy: matrix: - java-version: [ 25 ] + java-version: [ 26 ] os: [ ubuntu-latest ] steps: diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 5aeb00b..0596a39 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java-version: [ 25 ] + java-version: [ 21, 25, 26 ] os: [ ubuntu-latest, macos-latest, windows-latest ] steps: diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 5810d10..d1cd619 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -java = "25" +java = "26" springBoot = "4.1.0-RC1" poi = "5.5.1" opencsv = "5.12.0" From 9d4581b4ef8bde31cc61fa723c243b5948bda292 Mon Sep 17 00:00:00 2001 From: Matt Busche Date: Mon, 27 Apr 2026 22:31:27 -0500 Subject: [PATCH 2/5] add dynamic all-checks-passed --- .github/workflows/gradle.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 0596a39..8eb9fe8 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,3 +58,17 @@ jobs: echo "file 1 is smaller" exit 1 fi + + all-checks-passed: + runs-on: ubuntu-latest + needs: [build] + if: always() + steps: + - name: Check status of all required jobs + run: | + if [[ "${{ contains(needs.*.result, 'failure') || + contains(needs.*.result, 'cancelled') }}" == "true" ]]; then + echo "One or more dynamic checks failed." + exit 1 + fi + echo "All checks passed!" From e85e099e77dd50b048d8e94bb1e46c8dd0bc672e Mon Sep 17 00:00:00 2001 From: Matt Busche Date: Sun, 3 May 2026 21:24:46 -0500 Subject: [PATCH 3/5] Support 21, 25, and 26 --- .github/workflows/gradle.yml | 2 +- build.gradle.kts | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8eb9fe8..b59deed 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -29,7 +29,7 @@ jobs: - name: Run Gradle build env: SPRING_PROFILES_ACTIVE: test - run: ./gradlew build --parallel --configuration-cache + run: ./gradlew build --parallel --configuration-cache -PjavaVersion=${{ matrix.java-version }} - name: Generate file run: | diff --git a/build.gradle.kts b/build.gradle.kts index 523263d..7a6327e 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -8,9 +8,13 @@ plugins { group = "com.trap-scoring" version = "10.0.0" +val targetJavaVersion = providers.gradleProperty("javaVersion") + .orElse(libs.versions.java) + .map { it.toInt() } + java { toolchain { - languageVersion.set(JavaLanguageVersion.of(libs.versions.java.get().toInt())) + languageVersion.set(targetJavaVersion.map { JavaLanguageVersion.of(it) }) } } From fc15765a60b6d0bb823f00d80700c6db9c08eff5 Mon Sep 17 00:00:00 2001 From: Matt Busche Date: Sun, 3 May 2026 21:27:32 -0500 Subject: [PATCH 4/5] 25 and 26 only --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index b59deed..905f891 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -10,7 +10,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java-version: [ 21, 25, 26 ] + java-version: [ 25, 26 ] os: [ ubuntu-latest, macos-latest, windows-latest ] steps: From aed90e97b935c9b3740d5149ffc888f4b304ead2 Mon Sep 17 00:00:00 2001 From: Matt Busche Date: Sun, 3 May 2026 21:38:36 -0500 Subject: [PATCH 5/5] fix formatting --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 905f891..ccec2bb 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -61,7 +61,7 @@ jobs: all-checks-passed: runs-on: ubuntu-latest - needs: [build] + needs: [ build ] if: always() steps: - name: Check status of all required jobs