Revert "Disable errorprone RequestExplicitNullMarking (#15530)"

trask · trask · commit 9718d3eaf8a6 · 2025-12-04T12:43:36.000-08:00
This reverts commit 4e92977.
diff --git a/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts b/conventions/src/main/kotlin/otel.nullaway-conventions.gradle.kts
@@ -18,10 +18,6 @@ nullaway {
 
 tasks {
   withType<JavaCompile>().configureEach {
-    options.errorprone {
-      // workaround for https://github.com/google/error-prone/issues/5387
-      check("RequireExplicitNullMarking", CheckSeverity.OFF)
-    }
     options.errorprone.nullaway {
       if (name.contains("test", ignoreCase = true)) {
         disable()
@@ -34,3 +30,4 @@ tasks {
     }
   }
 }
+

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,6 @@ nullaway {`
`18`	`18`
`19`	`19`	`tasks {`
`20`	`20`	`withType<JavaCompile>().configureEach {`
`21`		`- options.errorprone {`
`22`		`- // workaround for https://github.com/google/error-prone/issues/5387`
`23`		`- check("RequireExplicitNullMarking", CheckSeverity.OFF)`
`24`		`- }`
`25`	`21`	`options.errorprone.nullaway {`
`26`	`22`	`if (name.contains("test", ignoreCase = true)) {`
`27`	`23`	`disable()`
`@@ -34,3 +30,4 @@ tasks {`
`34`	`30`	`}`
`35`	`31`	`}`
`36`	`32`	`}`
	`33`	`+`