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..ccec2bb 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: [ 25, 26 ] os: [ ubuntu-latest, macos-latest, windows-latest ] steps: @@ -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: | @@ -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!" 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) }) } } 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"