Add playServiceEnabled to gradle

app/build.gradle

@@ -2,13 +2,8 @@ apply plugin: 'com.android.application'
 apply plugin: 'org.jetbrains.kotlin.android'
 apply plugin: 'androidx.navigation.safeargs.kotlin'
 apply plugin: 'kotlin-kapt'
-apply plugin: 'com.google.gms.google-services'
-android.applicationVariants.all { variant ->
-    if(variant.name.contains('fdroid')) {
-        project.tasks.matching { it.name.contains("GoogleServices") }*.enabled = false
-    }
-}
-apply plugin: 'com.google.firebase.crashlytics'
+
+def playServiceEnabled
 
 android {
     compileSdk rootProject.ext.sdkVersion
@@ -54,13 +49,12 @@ android {
         gplay {
             dimension flavor_dimension_name
             buildConfigField("boolean", "IS_SUBSCRIPTIONS_ENABLED", "true")
+            playServiceEnabled = true
         }
         fdroid {
             dimension flavor_dimension_name
             buildConfigField("boolean", "IS_SUBSCRIPTIONS_ENABLED", "false")
-            firebaseCrashlytics {
-                mappingFileUploadEnabled false
-            }
+            playServiceEnabled = false
         }
     }
 
@@ -123,8 +117,8 @@ dependencies {
     implementation 'com.google.android.exoplayer:exoplayer:2.18.1'
 
     //Firebase crash reports
-    gplayImplementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.12'
-    gplayImplementation 'com.google.firebase:firebase-analytics-ktx:21.1.0'
+    gplayImplementation 'com.google.firebase:firebase-crashlytics-ktx:18.2.13'
+    gplayImplementation 'com.google.firebase:firebase-analytics-ktx:21.1.1'
 
     //Subscriptions
     gplayImplementation 'com.android.billingclient:billing-ktx:5.0.0'
@@ -136,4 +130,9 @@ dependencies {
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+}
+
+if (playServiceEnabled) {
+    apply plugin: 'com.google.gms.google-services'
+    apply plugin: 'com.google.firebase.crashlytics'
 }
\ No newline at end of file