From d8c44121c635dfef5a19ec54b59fbcb22d910ef1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Kautler?= Date: Fri, 10 Oct 2025 00:21:53 +0200 Subject: [PATCH] Test on Java 24 instead of 23 --- .github/workflows/branches-and-prs.yaml | 4 ++-- .github/workflows/release.yaml | 4 ++-- gradle.properties | 4 ++-- .../spockframework/smoke/extension/IgnoreIfExtension.groovy | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/branches-and-prs.yaml b/.github/workflows/branches-and-prs.yaml index 49e0587a7e..9c65c4da51 100644 --- a/.github/workflows/branches-and-prs.yaml +++ b/.github/workflows/branches-and-prs.yaml @@ -61,7 +61,7 @@ jobs: - '11' - '17' - '21' - - '23' + - '24' os: - 'ubuntu-latest' exclude: @@ -72,7 +72,7 @@ jobs: java: '21' os: 'ubuntu-latest' - variant: '2.5' - java: '23' + java: '24' os: 'ubuntu-latest' include: - variant: '2.5' diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 51e05d2541..1893a25b75 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -41,7 +41,7 @@ jobs: - '11' - '17' - '21' - - '23' + - '24' os: - 'ubuntu-latest' exclude: @@ -52,7 +52,7 @@ jobs: java: '21' os: 'ubuntu-latest' - variant: '2.5' - java: '23' + java: '24' os: 'ubuntu-latest' include: - variant: '2.5' diff --git a/gradle.properties b/gradle.properties index 935922dcdb..ed40c2df6a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,12 +15,12 @@ # org.gradle.java.installations.auto-download=false -org.gradle.java.installations.fromEnv=JDK8,JDK11,JDK17,JDK21,JDK23 +org.gradle.java.installations.fromEnv=JDK8,JDK11,JDK17,JDK21,JDK24 org.gradle.parallel=true org.gradle.caching=true javaVersionsList=8, 11, 17, 21 -additionalJavaTestVersionsList=23 +additionalJavaTestVersionsList=24 variantsList=2.5, 3.0, 4.0 kotlin.code.style=official diff --git a/spock-specs/src/test/groovy/org/spockframework/smoke/extension/IgnoreIfExtension.groovy b/spock-specs/src/test/groovy/org/spockframework/smoke/extension/IgnoreIfExtension.groovy index 63fc21aee5..880e559f01 100644 --- a/spock-specs/src/test/groovy/org/spockframework/smoke/extension/IgnoreIfExtension.groovy +++ b/spock-specs/src/test/groovy/org/spockframework/smoke/extension/IgnoreIfExtension.groovy @@ -41,7 +41,7 @@ class IgnoreIfExtension extends EmbeddedSpecification { @IgnoreIf({ jvm.java8 || jvm.java9 || jvm.java10 || jvm.java11 || jvm.java12 || jvm.java13 || jvm.java14 || jvm.java15 || jvm.java16 || jvm.java17 || - jvm.java18 || jvm.java19 || jvm.java20 || jvm.java21 || jvm.java22 || jvm.java23 + jvm.java18 || jvm.java19 || jvm.java20 || jvm.java21 || jvm.java22 || jvm.java23 || jvm.java24 }) def "provides JVM information"() { expect: false