From 3a38898961f9e3b3499d47bb3c97322a2d725729 Mon Sep 17 00:00:00 2001 From: Adam Brown Date: Tue, 9 Aug 2022 15:00:46 +0100 Subject: [PATCH] lifting fdroid and gplay variants to the application module --- vector-app/build.gradle | 16 +++++++++ .../src/fdroid/AndroidManifest.xml | 0 .../java/im/vector/app/di/FlavorModule.kt | 0 .../vector/app/di/NotificationTestModule.kt | 0 .../app/fdroid/BackgroundSyncStarter.kt | 0 .../troubleshoot/TestAutoStartBoot.kt | 0 .../TestBackgroundRestrictions.kt | 0 .../troubleshoot/TestBatteryOptimization.kt | 0 .../java/im/vector/app/fdroid/package-info.kt | 0 .../receiver/AlarmSyncBroadcastReceiver.kt | 0 .../OnApplicationUpgradeOrRebootReceiver.kt | 0 .../service/FDroidGuardServiceStarter.kt | 0 .../app/fdroid/service/GuardAndroidService.kt | 0 .../im/vector/app/push/fcm/FdroidFcmHelper.kt | 0 ...ificationTroubleshootTestManagerFactory.kt | 0 .../java/im/vector/app/GoogleFlavorLegals.kt | 0 .../java/im/vector/app/di/FlavorModule.kt | 0 .../vector/app/di/NotificationTestModule.kt | 0 .../troubleshoot/TestFirebaseToken.kt | 0 .../settings/troubleshoot/TestPlayServices.kt | 0 .../troubleshoot/TestTokenRegistration.kt | 0 .../java/im/vector/app/gplay/package-info.kt | 0 .../app/nightly/FirebaseNightlyProxy.kt | 0 .../im/vector/app/push/fcm/GoogleFcmHelper.kt | 0 ...ificationTroubleshootTestManagerFactory.kt | 0 .../fcm/VectorFirebaseMessagingService.kt | 0 vector/build.gradle | 35 ++----------------- 27 files changed, 19 insertions(+), 32 deletions(-) rename {vector => vector-app}/src/fdroid/AndroidManifest.xml (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/di/FlavorModule.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/package-info.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt (100%) rename {vector => vector-app}/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/di/FlavorModule.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/di/NotificationTestModule.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/gplay/package-info.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt (100%) rename {vector => vector-app}/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt (100%) diff --git a/vector-app/build.gradle b/vector-app/build.gradle index ea321c9e83..3f5c7a6c16 100644 --- a/vector-app/build.gradle +++ b/vector-app/build.gradle @@ -364,6 +364,22 @@ dependencies { debugImplementation 'com.facebook.soloader:soloader:0.10.4' debugImplementation "com.kgurgul.flipper:flipper-realm-android:2.2.0" + gplayImplementation "com.google.android.gms:play-services-location:16.0.0" + // UnifiedPush gplay flavor only + gplayImplementation('com.github.UnifiedPush:android-embedded_fcm_distributor:2.1.2') { + exclude group: 'com.google.firebase', module: 'firebase-core' + exclude group: 'com.google.firebase', module: 'firebase-analytics' + exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' + } + + // Nightly + // API-only library + gplayImplementation libs.google.appdistributionApi + // Full SDK implementation + gplayImplementation libs.google.appdistribution + + // OSS License, gplay flavor only + gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' kapt libs.dagger.hiltCompiler kapt libs.airbnb.epoxyProcessor diff --git a/vector/src/fdroid/AndroidManifest.xml b/vector-app/src/fdroid/AndroidManifest.xml similarity index 100% rename from vector/src/fdroid/AndroidManifest.xml rename to vector-app/src/fdroid/AndroidManifest.xml diff --git a/vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt b/vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/di/FlavorModule.kt rename to vector-app/src/fdroid/java/im/vector/app/di/FlavorModule.kt diff --git a/vector/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt b/vector-app/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt rename to vector-app/src/fdroid/java/im/vector/app/di/NotificationTestModule.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/BackgroundSyncStarter.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestAutoStartBoot.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBackgroundRestrictions.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/features/settings/troubleshoot/TestBatteryOptimization.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/package-info.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/package-info.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/AlarmSyncBroadcastReceiver.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/receiver/OnApplicationUpgradeOrRebootReceiver.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/service/FDroidGuardServiceStarter.kt diff --git a/vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt b/vector-app/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt rename to vector-app/src/fdroid/java/im/vector/app/fdroid/service/GuardAndroidService.kt diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt rename to vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidFcmHelper.kt diff --git a/vector/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt similarity index 100% rename from vector/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt rename to vector-app/src/fdroid/java/im/vector/app/push/fcm/FdroidNotificationTroubleshootTestManagerFactory.kt diff --git a/vector/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt b/vector-app/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt rename to vector-app/src/gplay/java/im/vector/app/GoogleFlavorLegals.kt diff --git a/vector/src/gplay/java/im/vector/app/di/FlavorModule.kt b/vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/di/FlavorModule.kt rename to vector-app/src/gplay/java/im/vector/app/di/FlavorModule.kt diff --git a/vector/src/gplay/java/im/vector/app/di/NotificationTestModule.kt b/vector-app/src/gplay/java/im/vector/app/di/NotificationTestModule.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/di/NotificationTestModule.kt rename to vector-app/src/gplay/java/im/vector/app/di/NotificationTestModule.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestFirebaseToken.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestPlayServices.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt b/vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/features/settings/troubleshoot/TestTokenRegistration.kt diff --git a/vector/src/gplay/java/im/vector/app/gplay/package-info.kt b/vector-app/src/gplay/java/im/vector/app/gplay/package-info.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/gplay/package-info.kt rename to vector-app/src/gplay/java/im/vector/app/gplay/package-info.kt diff --git a/vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt b/vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt rename to vector-app/src/gplay/java/im/vector/app/nightly/FirebaseNightlyProxy.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleFcmHelper.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/GoogleNotificationTroubleshootTestManagerFactory.kt diff --git a/vector/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt b/vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt similarity index 100% rename from vector/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt rename to vector-app/src/gplay/java/im/vector/app/push/fcm/VectorFirebaseMessagingService.kt diff --git a/vector/build.gradle b/vector/build.gradle index 3b802c8316..f6db2a61df 100644 --- a/vector/build.gradle +++ b/vector/build.gradle @@ -68,18 +68,6 @@ android { } } - flavorDimensions "store" - - productFlavors { - gplay { - dimension "store" - } - - fdroid { - dimension "store" - } - } - compileOptions { sourceCompatibility versions.sourceCompat targetCompatibility versions.targetCompat @@ -174,12 +162,6 @@ dependencies { // Snap Helper https://github.com/rubensousa/GravitySnapHelper api 'com.github.rubensousa:gravitysnaphelper:2.2.2' - // Nightly - // API-only library - gplayImplementation libs.google.appdistributionApi - // Full SDK implementation - gplayImplementation libs.google.appdistribution - // Work api libs.androidx.work @@ -247,15 +229,6 @@ dependencies { // UnifiedPush implementation 'com.github.UnifiedPush:android-connector:2.0.1' - // UnifiedPush gplay flavor only - gplayImplementation('com.google.firebase:firebase-messaging:23.0.8') { - exclude group: 'com.google.firebase', module: 'firebase-core' - exclude group: 'com.google.firebase', module: 'firebase-analytics' - exclude group: 'com.google.firebase', module: 'firebase-measurement-connector' - } - - // OSS License, gplay flavor only - gplayImplementation 'com.google.android.gms:play-services-oss-licenses:17.0.0' implementation "androidx.emoji2:emoji2:1.1.0" @@ -291,14 +264,12 @@ dependencies { implementation 'commons-codec:commons-codec:1.15' // MapTiler - fdroidApi(libs.maplibre.androidSdk) { + api(libs.maplibre.androidSdk) { exclude group: 'com.google.android.gms', module: 'play-services-location' } - fdroidApi(libs.maplibre.pluginAnnotation) { + api(libs.maplibre.pluginAnnotation) { exclude group: 'com.google.android.gms', module: 'play-services-location' } - gplayApi libs.maplibre.androidSdk - gplayApi libs.maplibre.pluginAnnotation // TESTS testImplementation libs.tests.junit @@ -310,7 +281,7 @@ dependencies { testImplementation(libs.jetbrains.coroutinesTest) { exclude group: "org.jetbrains.kotlinx", module: "kotlinx-coroutines-debug" } - + androidTestImplementation libs.androidx.testCore androidTestImplementation libs.androidx.testRunner androidTestImplementation libs.androidx.testRules