update spotbugs scripts

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>

1 files changed, 9 insertions, 4 deletions

diff --git a/app/build.gradle b/app/build.gradle
index 4f085b9aa..0a0b58ecb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -30,14 +30,19 @@ configurations {
     ktlint
 }
 
-def taskRequest = getGradle().getStartParameter().getTaskRequests().toString()
-if (taskRequest.contains("Gplay") || taskRequest.contains("findbugs") || taskRequest.contains("lint")) {
-    apply from: 'gplay.gradle'
+for (TaskExecutionRequest tr : getGradle().getStartParameter().getTaskRequests()) {
+    for (String arg : tr.args) {
+        // any gplay, but only exact "build", as e.g. buildGeneric shall not apply gplay.grade
+        if (arg.contains("Gplay") || arg.contains("lint") || arg == "build") {
+            apply from: 'gplay.gradle'
+            System.console().println("Applying gplay.gradle")
+        }
+    }
 }
 
 android {
     compileSdkVersion 29
-    buildToolsVersion '29.0.2'
+    buildToolsVersion '30.0.3'
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 29