From 9d521ea62581fa407b75dacc8ce012851eabb326 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 25 Sep 2025 19:30:08 +0000 Subject: [PATCH 1/5] chore(deps): update plugin org.graalvm.buildtools.native to v0.11.1 --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index cb59909198b..40d74cea988 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ pluginManagement { id("de.undercouch.download") version "5.6.0" id("org.jsonschema2pojo") version "1.2.2" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("org.graalvm.buildtools.native") version "0.10.6" + id("org.graalvm.buildtools.native") version "0.11.1" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } } From 3e2a990c6dee45a72964b9c3c2ac5101759bc7c6 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 9 Oct 2025 12:10:15 +0200 Subject: [PATCH 2/5] bump min java version --- integration-tests/graal-incubating/build.gradle.kts | 13 ++++++++++++- integration-tests/graal/build.gradle.kts | 13 ++++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/integration-tests/graal-incubating/build.gradle.kts b/integration-tests/graal-incubating/build.gradle.kts index c30cb597f2d..025d96d1751 100644 --- a/integration-tests/graal-incubating/build.gradle.kts +++ b/integration-tests/graal-incubating/build.gradle.kts @@ -26,8 +26,19 @@ dependencies { implementation(project(":api:incubator")) } -// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26 +// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.1 // https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc +tasks { + withType().configureEach { + sourceCompatibility = "17" + targetCompatibility = "17" + options.release.set(17) + } + withType().configureEach { + val testJavaVersion: String? by project + enabled = !testJavaVersion.equals("8") + } +} graalvmNative { binaries { diff --git a/integration-tests/graal/build.gradle.kts b/integration-tests/graal/build.gradle.kts index 4086a91e778..cce0f8854fc 100644 --- a/integration-tests/graal/build.gradle.kts +++ b/integration-tests/graal/build.gradle.kts @@ -24,8 +24,19 @@ dependencies { implementation(project(":exporters:otlp:all")) } -// org.graalvm.buildtools.native plugin requires java 11+ as of version 0.9.26 +// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.1 // https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc +tasks { + withType().configureEach { + sourceCompatibility = "17" + targetCompatibility = "17" + options.release.set(17) + } + withType().configureEach { + val testJavaVersion: String? by project + enabled = !testJavaVersion.equals("8") + } +} graalvmNative { binaries { From cad87700fe8cd003c0e97b4a06148881cf2cd6d9 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 9 Oct 2025 12:33:30 +0200 Subject: [PATCH 3/5] bump min java version --- integration-tests/graal-incubating/build.gradle.kts | 10 ++++++---- integration-tests/graal/build.gradle.kts | 10 ++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/integration-tests/graal-incubating/build.gradle.kts b/integration-tests/graal-incubating/build.gradle.kts index 025d96d1751..2172563e276 100644 --- a/integration-tests/graal-incubating/build.gradle.kts +++ b/integration-tests/graal-incubating/build.gradle.kts @@ -27,16 +27,18 @@ dependencies { } // org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.1 +val minJavaVersionForGraalVM = 17 + // https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc tasks { withType().configureEach { - sourceCompatibility = "17" - targetCompatibility = "17" - options.release.set(17) + sourceCompatibility = minJavaVersionForGraalVM.toString() + targetCompatibility = minJavaVersionForGraalVM.toString() + options.release.set(minJavaVersionForGraalVM) } withType().configureEach { val testJavaVersion: String? by project - enabled = !testJavaVersion.equals("8") + enabled = (testJavaVersion?.toInt() ?: minJavaVersionForGraalVM) >= minJavaVersionForGraalVM } } diff --git a/integration-tests/graal/build.gradle.kts b/integration-tests/graal/build.gradle.kts index cce0f8854fc..1c1fef718dd 100644 --- a/integration-tests/graal/build.gradle.kts +++ b/integration-tests/graal/build.gradle.kts @@ -25,16 +25,18 @@ dependencies { } // org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.1 +val minJavaVersionForGraalVM = 17 + // https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc tasks { withType().configureEach { - sourceCompatibility = "17" - targetCompatibility = "17" - options.release.set(17) + sourceCompatibility = minJavaVersionForGraalVM.toString() + targetCompatibility = minJavaVersionForGraalVM.toString() + options.release.set(minJavaVersionForGraalVM) } withType().configureEach { val testJavaVersion: String? by project - enabled = !testJavaVersion.equals("8") + enabled = (testJavaVersion?.toInt() ?: minJavaVersionForGraalVM) >= minJavaVersionForGraalVM } } From 1b789d09d691a18ba18e5435afcc1ab62c7a0a35 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Thu, 30 Oct 2025 14:55:52 +0100 Subject: [PATCH 4/5] update --- settings.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/settings.gradle.kts b/settings.gradle.kts index 40d74cea988..4a42fe0e9c7 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ pluginManagement { id("de.undercouch.download") version "5.6.0" id("org.jsonschema2pojo") version "1.2.2" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("org.graalvm.buildtools.native") version "0.11.1" + id("org.graalvm.buildtools.native") version "0.11.2" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } } From b17e495311392529f81bf33951c7ea8f812b0c44 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Tue, 11 Nov 2025 17:25:44 +0100 Subject: [PATCH 5/5] rebase, try new native build tools --- .../graal-incubating/build.gradle.kts | 20 +++---------------- integration-tests/graal/build.gradle.kts | 20 +++---------------- settings.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 35 deletions(-) diff --git a/integration-tests/graal-incubating/build.gradle.kts b/integration-tests/graal-incubating/build.gradle.kts index 2172563e276..d109f897157 100644 --- a/integration-tests/graal-incubating/build.gradle.kts +++ b/integration-tests/graal-incubating/build.gradle.kts @@ -7,7 +7,9 @@ plugins { description = "OpenTelemetry Graal Integration Tests (Incubating)" otelJava.moduleName.set("io.opentelemetry.graal.integration.tests.incubating") -otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11) +// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.9.26 +// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc +otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17) sourceSets { main { @@ -26,22 +28,6 @@ dependencies { implementation(project(":api:incubator")) } -// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.1 -val minJavaVersionForGraalVM = 17 - -// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc -tasks { - withType().configureEach { - sourceCompatibility = minJavaVersionForGraalVM.toString() - targetCompatibility = minJavaVersionForGraalVM.toString() - options.release.set(minJavaVersionForGraalVM) - } - withType().configureEach { - val testJavaVersion: String? by project - enabled = (testJavaVersion?.toInt() ?: minJavaVersionForGraalVM) >= minJavaVersionForGraalVM - } -} - graalvmNative { binaries { named("test") { diff --git a/integration-tests/graal/build.gradle.kts b/integration-tests/graal/build.gradle.kts index 1c1fef718dd..842f4fb7b14 100644 --- a/integration-tests/graal/build.gradle.kts +++ b/integration-tests/graal/build.gradle.kts @@ -7,7 +7,9 @@ plugins { description = "OpenTelemetry Graal Integration Tests" otelJava.moduleName.set("io.opentelemetry.graal.integration.tests") -otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11) +// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.9.26 +// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc +otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17) sourceSets { main { @@ -24,22 +26,6 @@ dependencies { implementation(project(":exporters:otlp:all")) } -// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.1 -val minJavaVersionForGraalVM = 17 - -// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc -tasks { - withType().configureEach { - sourceCompatibility = minJavaVersionForGraalVM.toString() - targetCompatibility = minJavaVersionForGraalVM.toString() - options.release.set(minJavaVersionForGraalVM) - } - withType().configureEach { - val testJavaVersion: String? by project - enabled = (testJavaVersion?.toInt() ?: minJavaVersionForGraalVM) >= minJavaVersionForGraalVM - } -} - graalvmNative { binaries { named("test") { diff --git a/settings.gradle.kts b/settings.gradle.kts index 4a42fe0e9c7..5fddc36000d 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -5,7 +5,7 @@ pluginManagement { id("de.undercouch.download") version "5.6.0" id("org.jsonschema2pojo") version "1.2.2" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("org.graalvm.buildtools.native") version "0.11.2" + id("org.graalvm.buildtools.native") version "0.11.3" id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0" } }