Skip to content

build(android): Run Error Prone and NullAway on the Android modules #6493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
runningcode wants to merge 1 commit into
base: 9.x.x
Choose a base branch
from
Draft

build(android): Run Error Prone and NullAway on the Android modules #6493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions sentry-android-core/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,16 @@ android {
}
}

tasks.withType<JavaCompile>().configureEach {
options.errorprone {
check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
option("NullAway:AnnotatedPackages", "io.sentry")
// net.ltgt.errorprone only configures Gradle's JVM source sets, not Android variants, so put Error
// Prone on each variant's processor path and enable it ourselves.
androidComponents.onVariants { variant ->
variant.annotationProcessorConfiguration.extendsFrom(configurations.errorprone.get())
variant.configureJavaCompileTask { task ->
task.options.errorprone {
enabled = true
check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
option("NullAway:AnnotatedPackages", "io.sentry")
}
}
}

Expand Down
18 changes: 13 additions & 5 deletions sentry-android-integration-tests/sentry-uitest-android/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,11 +125,19 @@ dependencies {
androidTestImplementation(libs.okhttp.mockwebserver)
}

tasks.withType<JavaCompile>().configureEach {
options.errorprone {
check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
option("NullAway:AnnotatedPackages", "io.sentry")
option("NullAway:UnannotatedSubPackages", "io.sentry.uitest.android.databinding")
// net.ltgt.errorprone only configures Gradle's JVM source sets, not Android variants, so put Error
// Prone on each variant's processor path and enable it ourselves.
androidComponents.onVariants { variant ->
variant.annotationProcessorConfiguration.extendsFrom(configurations.errorprone.get())
variant.configureJavaCompileTask { task ->
task.options.errorprone {
enabled = true
check("NullAway", net.ltgt.gradle.errorprone.CheckSeverity.ERROR)
option("NullAway:AnnotatedPackages", "io.sentry")
option("NullAway:UnannotatedSubPackages", "io.sentry.uitest.android.databinding")
// AGP generates the view binding classes, so their findings can't be fixed here.
excludedPaths.set(".*/build/generated/.*")
}
}
}

Expand Down
Loading