From e4f04c7f452c7145653e4e75c8272f607d009871 Mon Sep 17 00:00:00 2001 From: Cedric Champeau Date: Fri, 22 Aug 2025 16:38:47 +0200 Subject: [PATCH] Add testing of Gradle 9 --- .../groovy/org.graalvm.build.github-actions-helper.gradle | 4 ++-- .../main/groovy/org.graalvm.build.functional-testing.gradle | 4 ++-- .../src/main/resources/initialize-at-buildtime | 2 ++ samples/kotlin-application-with-tests/build.gradle | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle b/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle index e639bd997..876983173 100644 --- a/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle +++ b/build-logic/common-plugins/src/main/groovy/org.graalvm.build.github-actions-helper.gradle @@ -7,11 +7,11 @@ def matrixDefault = [ // # Following versions are disabled temporarily in order to speed up PR testing "7.3.3", "7.2", "7.1", "6.8.3", def gradleVersions = [ - "gradle-version": ["current", "8.4", "8.14.2"], + "gradle-version": ["current", "8.4", "8.14.2", "9.0.0"], ] def gradleCachedVersions = [ - "gradle-config-cache-version": ["current", "8.14.2"] + "gradle-config-cache-version": ["current", "9.0.0"] ] sourceSets.configureEach { sourceSet -> diff --git a/build-logic/gradle-functional-testing/src/main/groovy/org.graalvm.build.functional-testing.gradle b/build-logic/gradle-functional-testing/src/main/groovy/org.graalvm.build.functional-testing.gradle index 3125fc3cb..c4822e5e3 100644 --- a/build-logic/gradle-functional-testing/src/main/groovy/org.graalvm.build.functional-testing.gradle +++ b/build-logic/gradle-functional-testing/src/main/groovy/org.graalvm.build.functional-testing.gradle @@ -83,8 +83,8 @@ def graalVm = javaToolchains.launcherFor { def fullFunctionalTest = tasks.register("fullFunctionalTest") -['functionalTest': ["current", "8.4", "8.14.2"], - 'configCacheFunctionalTest': ['current', "8.14.2"] +['functionalTest': ["current", "8.4", "8.14.2", "9.0.0"], + 'configCacheFunctionalTest': ['current', "9.0.0"] ].each { baseName, gradleVersions -> gradleVersions.each { gradleVersion -> String taskName = gradleVersion == 'current' ? baseName : "gradle${gradleVersion}${baseName.capitalize()}" diff --git a/common/junit-platform-native/src/main/resources/initialize-at-buildtime b/common/junit-platform-native/src/main/resources/initialize-at-buildtime index 279c3a80b..98e6f1667 100644 --- a/common/junit-platform-native/src/main/resources/initialize-at-buildtime +++ b/common/junit-platform-native/src/main/resources/initialize-at-buildtime @@ -123,3 +123,5 @@ org.junit.vintage.engine.JUnit4VersionCheck org.junit.vintage.engine.support.UniqueIdReader org.junit.vintage.engine.support.UniqueIdStringifier org.junit.vintage.engine.VintageTestEngine +kotlin.annotation.AnnotationTarget +kotlin.annotation.AnnotationRetention diff --git a/samples/kotlin-application-with-tests/build.gradle b/samples/kotlin-application-with-tests/build.gradle index 4a97a4997..331902f2e 100644 --- a/samples/kotlin-application-with-tests/build.gradle +++ b/samples/kotlin-application-with-tests/build.gradle @@ -40,7 +40,7 @@ */ plugins { - id 'org.jetbrains.kotlin.jvm' version '1.7.22' + id 'org.jetbrains.kotlin.jvm' version '1.9.25' id 'application' id 'org.graalvm.buildtools.native' }