Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ tasks {

// We use animal sniffer
disable("Java8ApiChecker")
disable("AndroidJdkLibsChecker")

// apparently disabling android doesn't disable this
disable("StaticOrDefaultInterfaceMethod")
Expand Down
10 changes: 5 additions & 5 deletions custom-checks/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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?)
}
Expand Down Expand Up @@ -43,17 +43,17 @@ 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
}
}
}

tasks.withType<Test>().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")
Expand Down
2 changes: 1 addition & 1 deletion dependencyManagement/build.gradle.kts
Comment thread
trask marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading