Skip to content

Commit b17e495

Browse files
committed
rebase, try new native build tools
1 parent 1b789d0 commit b17e495

File tree

3 files changed

+7
-35
lines changed

3 files changed

+7
-35
lines changed

integration-tests/graal-incubating/build.gradle.kts

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ plugins {
77

88
description = "OpenTelemetry Graal Integration Tests (Incubating)"
99
otelJava.moduleName.set("io.opentelemetry.graal.integration.tests.incubating")
10-
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11)
10+
// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.9.26
11+
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
12+
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17)
1113

1214
sourceSets {
1315
main {
@@ -26,22 +28,6 @@ dependencies {
2628
implementation(project(":api:incubator"))
2729
}
2830

29-
// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.1
30-
val minJavaVersionForGraalVM = 17
31-
32-
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
33-
tasks {
34-
withType<JavaCompile>().configureEach {
35-
sourceCompatibility = minJavaVersionForGraalVM.toString()
36-
targetCompatibility = minJavaVersionForGraalVM.toString()
37-
options.release.set(minJavaVersionForGraalVM)
38-
}
39-
withType<Test>().configureEach {
40-
val testJavaVersion: String? by project
41-
enabled = (testJavaVersion?.toInt() ?: minJavaVersionForGraalVM) >= minJavaVersionForGraalVM
42-
}
43-
}
44-
4531
graalvmNative {
4632
binaries {
4733
named("test") {

integration-tests/graal/build.gradle.kts

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ plugins {
77

88
description = "OpenTelemetry Graal Integration Tests"
99
otelJava.moduleName.set("io.opentelemetry.graal.integration.tests")
10-
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_11)
10+
// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.9.26
11+
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
12+
otelJava.minJavaVersionSupported.set(JavaVersion.VERSION_17)
1113

1214
sourceSets {
1315
main {
@@ -24,22 +26,6 @@ dependencies {
2426
implementation(project(":exporters:otlp:all"))
2527
}
2628

27-
// org.graalvm.buildtools.native plugin requires java 17+ as of version 0.11.1
28-
val minJavaVersionForGraalVM = 17
29-
30-
// https://github.com/graalvm/native-build-tools/blob/master/docs/src/docs/asciidoc/index.adoc
31-
tasks {
32-
withType<JavaCompile>().configureEach {
33-
sourceCompatibility = minJavaVersionForGraalVM.toString()
34-
targetCompatibility = minJavaVersionForGraalVM.toString()
35-
options.release.set(minJavaVersionForGraalVM)
36-
}
37-
withType<Test>().configureEach {
38-
val testJavaVersion: String? by project
39-
enabled = (testJavaVersion?.toInt() ?: minJavaVersionForGraalVM) >= minJavaVersionForGraalVM
40-
}
41-
}
42-
4329
graalvmNative {
4430
binaries {
4531
named("test") {

settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ pluginManagement {
55
id("de.undercouch.download") version "5.6.0"
66
id("org.jsonschema2pojo") version "1.2.2"
77
id("io.github.gradle-nexus.publish-plugin") version "2.0.0"
8-
id("org.graalvm.buildtools.native") version "0.11.2"
8+
id("org.graalvm.buildtools.native") version "0.11.3"
99
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
1010
}
1111
}

0 commit comments

Comments
 (0)