Merge pull request #3529 from erikhuizinga/erikhuizinga-3527-fix-google-play-service-application

Apply Google Services Gradle plugin more robustly

vector/build.gradle

@@ -246,6 +246,11 @@ android {
 
     productFlavors {
         gplay {
+            apply plugin: 'com.google.gms.google-services'
+            afterEvaluate {
+                tasks.matching { it.name.contains("GoogleServices") && !it.name.contains("Gplay") }*.enabled = false
+            }
+
             dimension "store"
             isDefault = true
             versionName "${versionMajor}.${versionMinor}.${versionPatch}${getGplayVersionSuffix()}"
@@ -506,7 +511,3 @@ dependencies {
         exclude group: 'org.jetbrains.kotlin'
     }
 }
-
-if (getGradle().getStartParameter().getTaskRequests().toString().contains("Gplay")) {
-    apply plugin: 'com.google.gms.google-services'
-}