From 90dd63d1f330ed94f20e088603a05a1f7785354a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Thu, 7 Oct 2021 17:51:05 +0200
Subject: [PATCH] Use build flavor for implementation declaration
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Instead of loading dependencies with an own snippet of code now the
provided functionality of configure flavor based implementation
declaration is used.

This change results in some more warning which will no be fixied in this
commit.

See: https://developer.android.com/studio/build/build-variants#dependencies

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 app/build.gradle                  | 12 ++----------
 app/gplay.gradle                  | 23 -----------------------
 scripts/analysis/lint-results.txt |  2 +-
 scripts/analysis/lint-up.rb       |  4 ++--
 4 files changed, 5 insertions(+), 36 deletions(-)
 delete mode 100644 app/gplay.gradle

diff --git a/app/build.gradle b/app/build.gradle
index b0061a2ae..8fd4208a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,16 +34,6 @@ configurations {
     ktlint
 }
 
-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 30
     buildToolsVersion '30.0.3'
@@ -305,6 +295,8 @@ dependencies {
     })
     spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.11.0'
     spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.4.7'
+
+    gplayImplementation "com.google.firebase:firebase-messaging:20.1.2"
 }
 
 task ktlint(type: JavaExec, group: "verification") {
diff --git a/app/gplay.gradle b/app/gplay.gradle
deleted file mode 100644
index 29680af74..000000000
--- a/app/gplay.gradle
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Nextcloud Talk application
- *
- * @author Mario Danic
- * Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-dependencies {
-  implementation "com.google.firebase:firebase-messaging:20.1.2"
-}
diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt
index 8ea2ec126..acfd83fde 100644
--- a/scripts/analysis/lint-results.txt
+++ b/scripts/analysis/lint-results.txt
@@ -1,2 +1,2 @@
 DO NOT TOUCH; GENERATED BY DRONE
-      <span class="mdl-layout-title">Lint Report: 1 errors and 266 warnings</span>
+      <span class="mdl-layout-title">Lint Report: 1 errors and 270 warnings</span>
diff --git a/scripts/analysis/lint-up.rb b/scripts/analysis/lint-up.rb
index cdd087556..222fff815 100644
--- a/scripts/analysis/lint-up.rb
+++ b/scripts/analysis/lint-up.rb
@@ -56,12 +56,12 @@ end
 
 # run Lint
 puts "running Lint..."
-system './gradlew clean assembleGplay lint'
+system './gradlew clean lintGplayDebug'
 
 # confirm that Lint ran w/out error
 result = $?.to_i
 if result != 0
-    puts "FAIL: failed to run ./gradlew clean assembleGplay lint"
+    puts "FAIL: failed to run ./gradlew clean lintGplayDebug"
     exit 1
 end