From 3eb835ae08d049ff50de479f1f621f34e1b5dffd Mon Sep 17 00:00:00 2001 From: Simon Marquis Date: Sat, 27 May 2023 12:26:19 +0200 Subject: [PATCH] Declare `SyncNotificationsService` only in `prod` sourceSet And move Firebase Messaging dependency to the appropriate configuration. Relates to #360 ``` nowinandroid/app/src/main/AndroidManifest.xml Warning: meta-data#com.google.samples.apps.nowinandroid.sync.initializers.SyncInitializer was tagged at AndroidManifest.xml:0 to remove other declarations but no other declaration present ``` --- sync/work/build.gradle.kts | 3 ++- sync/work/src/demo/AndroidManifest.xml | 27 ------------------- .../src/{main => prod}/AndroidManifest.xml | 0 .../sync/services/SyncNotificationsService.kt | 0 4 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 sync/work/src/demo/AndroidManifest.xml rename sync/work/src/{main => prod}/AndroidManifest.xml (100%) rename sync/work/src/{main => prod}/kotlin/com/google/samples/apps/nowinandroid/sync/services/SyncNotificationsService.kt (100%) diff --git a/sync/work/build.gradle.kts b/sync/work/build.gradle.kts index 79902e486..e6db025b7 100644 --- a/sync/work/build.gradle.kts +++ b/sync/work/build.gradle.kts @@ -35,10 +35,11 @@ dependencies { implementation(libs.androidx.lifecycle.livedata.ktx) implementation(libs.androidx.tracing.ktx) implementation(libs.androidx.work.ktx) - implementation(libs.firebase.cloud.messaging) implementation(libs.hilt.ext.work) implementation(libs.kotlinx.coroutines.android) + prodImplementation(libs.firebase.cloud.messaging) + kapt(libs.hilt.ext.compiler) testImplementation(project(":core:testing")) diff --git a/sync/work/src/demo/AndroidManifest.xml b/sync/work/src/demo/AndroidManifest.xml deleted file mode 100644 index 8dc32c86f..000000000 --- a/sync/work/src/demo/AndroidManifest.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - diff --git a/sync/work/src/main/AndroidManifest.xml b/sync/work/src/prod/AndroidManifest.xml similarity index 100% rename from sync/work/src/main/AndroidManifest.xml rename to sync/work/src/prod/AndroidManifest.xml diff --git a/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/services/SyncNotificationsService.kt b/sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/services/SyncNotificationsService.kt similarity index 100% rename from sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/services/SyncNotificationsService.kt rename to sync/work/src/prod/kotlin/com/google/samples/apps/nowinandroid/sync/services/SyncNotificationsService.kt