From cf470052ab24d1569a638d5b69deaaee4921c356 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 28 Oct 2025 20:03:24 +0000 Subject: [PATCH 1/3] fix(deps): update errorproneversion to v2.43.0 --- dependencyManagement/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencyManagement/build.gradle.kts b/dependencyManagement/build.gradle.kts index 29023c77ca0..42f454212a4 100644 --- a/dependencyManagement/build.gradle.kts +++ b/dependencyManagement/build.gradle.kts @@ -9,7 +9,7 @@ rootProject.extra["versions"] = dependencyVersions val autoValueVersion = "1.11.0" -val errorProneVersion = "2.42.0" +val errorProneVersion = "2.43.0" val jmhVersion = "1.37" // Mockito 5.x.x requires Java 11 https://github.com/mockito/mockito/releases/tag/v5.0.0 val mockitoVersion = "4.11.0" From ce01ea986a65162851675bd267e8eaacb4c63485 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 28 Oct 2025 13:26:31 -0700 Subject: [PATCH 2/3] fix --- buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts index 29ac44b3abf..86c500db998 100644 --- a/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/otel.errorprone-conventions.gradle.kts @@ -51,7 +51,6 @@ tasks { // We use animal sniffer disable("Java8ApiChecker") - disable("AndroidJdkLibsChecker") // apparently disabling android doesn't disable this disable("StaticOrDefaultInterfaceMethod") From e9bb4043530918d0ea51ef821827752a79d980a7 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Tue, 28 Oct 2025 13:56:02 -0700 Subject: [PATCH 3/3] fix --- custom-checks/build.gradle.kts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/custom-checks/build.gradle.kts b/custom-checks/build.gradle.kts index adce219eff0..6eecf747075 100644 --- a/custom-checks/build.gradle.kts +++ b/custom-checks/build.gradle.kts @@ -14,8 +14,8 @@ otelJava.moduleName.set("io.opentelemetry.javaagent.customchecks") // We also can't seem to use the toolchain without the "--release" option. So disable everything. java { - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 toolchain { languageVersion.set(null as JavaLanguageVersion?) } @@ -43,9 +43,9 @@ tasks { } } - // only test on java 17+ + // only test on java 21+ val testJavaVersion: String? by project - if (testJavaVersion != null && Integer.valueOf(testJavaVersion) < 17) { + if (testJavaVersion != null && Integer.valueOf(testJavaVersion) < 21) { test { enabled = false } @@ -53,7 +53,7 @@ tasks { } tasks.withType().configureEach { - // required on jdk17 + // required when accessing javac internals jvmArgs("--add-opens=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED") jvmArgs("--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED") jvmArgs("--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED")