From 2bf496825011dae7a5c2d5cc47e50525433dcaad Mon Sep 17 00:00:00 2001 From: ssangamesh Date: Mon, 28 Apr 2025 04:34:33 +0000 Subject: [PATCH 1/5] Android: Add failOnWarnings check to android build.gradle and configure lint as warnings as error --- android/build.gradle | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index 3c717da18a3..d861aee048b 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,7 +20,15 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - lintOptions { abortOnError true } + + //fail on android lint warnings if failOnWarning is set true + lintOptions { + abortOnError true + if (rootProject.hasProperty("failOnWarnings") && rootProject.failOnWarnings.toBoolean()) { + warningsAsErrors true + } + } + publishing { singleVariant('release') { withSourcesJar() @@ -44,6 +52,14 @@ dependencies { testImplementation libraries.truth } +//Enforce -Werror on java compiler if failOnWarning is set +tasks.withType(JavaCompile).configureEach { + it.options.compilerArgs += ["-Xlint:all"] + if (rootProject.hasProperty("failOnWarnings") && rootProject.failOnWarnings.toBoolean()) { + it.options.compilerArgs += ["-Werror"] + } +} + tasks.register("javadocs", Javadoc) { source = android.sourceSets.main.java.srcDirs classpath += files(android.getBootClasspath()) From c571f774ee2970149773b123f73048ad6a1b6e69 Mon Sep 17 00:00:00 2001 From: ssangamesh Date: Mon, 28 Apr 2025 10:32:51 +0000 Subject: [PATCH 2/5] android: added white space --- android/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index d861aee048b..b260f52b282 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -21,7 +21,7 @@ android { testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - //fail on android lint warnings if failOnWarning is set true + // fail on android lint warnings if failOnWarning is set true lintOptions { abortOnError true if (rootProject.hasProperty("failOnWarnings") && rootProject.failOnWarnings.toBoolean()) { @@ -52,7 +52,7 @@ dependencies { testImplementation libraries.truth } -//Enforce -Werror on java compiler if failOnWarning is set +// Enforce -Werror on java compiler if failOnWarning is set tasks.withType(JavaCompile).configureEach { it.options.compilerArgs += ["-Xlint:all"] if (rootProject.hasProperty("failOnWarnings") && rootProject.failOnWarnings.toBoolean()) { From 148c017644ec21814fb48206d3bab45e9451ff89 Mon Sep 17 00:00:00 2001 From: ssangamesh Date: Tue, 6 May 2025 07:47:35 +0000 Subject: [PATCH 3/5] Android : added review comments point --- android/build.gradle | 18 +----------------- build.gradle | 11 +++++++++++ 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/android/build.gradle b/android/build.gradle index b260f52b282..3c717da18a3 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -20,15 +20,7 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } - - // fail on android lint warnings if failOnWarning is set true - lintOptions { - abortOnError true - if (rootProject.hasProperty("failOnWarnings") && rootProject.failOnWarnings.toBoolean()) { - warningsAsErrors true - } - } - + lintOptions { abortOnError true } publishing { singleVariant('release') { withSourcesJar() @@ -52,14 +44,6 @@ dependencies { testImplementation libraries.truth } -// Enforce -Werror on java compiler if failOnWarning is set -tasks.withType(JavaCompile).configureEach { - it.options.compilerArgs += ["-Xlint:all"] - if (rootProject.hasProperty("failOnWarnings") && rootProject.failOnWarnings.toBoolean()) { - it.options.compilerArgs += ["-Werror"] - } -} - tasks.register("javadocs", Javadoc) { source = android.sourceSets.main.java.srcDirs classpath += files(android.getBootClasspath()) diff --git a/build.gradle b/build.gradle index 42e16fbfef9..2fff5908c33 100644 --- a/build.gradle +++ b/build.gradle @@ -23,6 +23,17 @@ subprojects { group = "io.grpc" version = "1.73.0-SNAPSHOT" // CURRENT_GRPC_VERSION + plugins.withId("com.android.base") { + android { + lint { + abortOnError true + if (rootProject.hasProperty('failOnWarnings') && rootProject.failOnWarnings.toBoolean()) { + warningsAsErrors true + } + } + } + } + repositories { maven { // The google mirror is less flaky than mavenCentral() url "https://maven-central.storage-download.googleapis.com/maven2/" From 94f92f6c58495e9b97448d534adc31a97d1859c7 Mon Sep 17 00:00:00 2001 From: ssangamesh Date: Mon, 12 May 2025 17:44:50 +0000 Subject: [PATCH 4/5] Android : added review comments point --- build.gradle | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/build.gradle b/build.gradle index bb4244448f3..ad02a7ec8dc 100644 --- a/build.gradle +++ b/build.gradle @@ -34,6 +34,15 @@ subprojects { } } + tasks.withType(JavaCompile).configureEach { + it.options.compilerArgs += [ + "-Xlint:all" + ] + if (rootProject.hasProperty('failOnWarnings') && rootProject.failOnWarnings.toBoolean()) { + it.options.compilerArgs += ["-Werror"] + } + } + repositories { maven { // The google mirror is less flaky than mavenCentral() url "https://maven-central.storage-download.googleapis.com/maven2/" From b151cb0961b55fc6afa32fc2aff85b0b3ac55977 Mon Sep 17 00:00:00 2001 From: ssangamesh Date: Tue, 27 May 2025 07:47:51 +0000 Subject: [PATCH 5/5] Added review comments points --- build.gradle | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index 321b8077037..2998eb555d8 100644 --- a/build.gradle +++ b/build.gradle @@ -32,14 +32,13 @@ subprojects { } } } - } - - tasks.withType(JavaCompile).configureEach { - it.options.compilerArgs += [ - "-Xlint:all" - ] - if (rootProject.hasProperty('failOnWarnings') && rootProject.failOnWarnings.toBoolean()) { - it.options.compilerArgs += ["-Werror"] + tasks.withType(JavaCompile).configureEach { + it.options.compilerArgs += [ + "-Xlint:all" + ] + if (rootProject.hasProperty('failOnWarnings') && rootProject.failOnWarnings.toBoolean()) { + it.options.compilerArgs += ["-Werror"] + } } }