Skip to content

Commit bd8cd29

Browse files
committed
fix
1 parent 23b07cb commit bd8cd29

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

conventions/src/main/kotlin/otel.errorprone-conventions.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,6 @@ tasks {
124124

125125
// Requires adding compile dependency to JSpecify
126126
disable("AddNullMarkedToPackageInfo")
127-
disable("RequireExplicitNullMarking")
128127

129128
if (testLatestDeps) {
130129
// Some latest dep tests are compiled for java 17 although the base version uses an older

conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,10 @@ nullaway {
1818

1919
tasks {
2020
withType<JavaCompile>().configureEach {
21+
options.errorprone {
22+
// workaround for https://github.com/google/error-prone/issues/5387
23+
check("RequireExplicitNullMarking", CheckSeverity.OFF)
24+
}
2125
options.errorprone.nullaway {
2226
if (name.contains("test", ignoreCase = true)) {
2327
disable()
@@ -30,4 +34,3 @@ tasks {
3034
}
3135
}
3236
}
33-

0 commit comments

Comments
 (0)