Migrate :core:common to pure JVM module

The notification icons are now stored in `:core:notifications`. This forces `:sync:work` to depend on it. Another solution could be to provide the resource id through Hilt, but it would require more changes.
android · Dec 22, 2023 · 61c7d71 · 61c7d71
1 parent 4574317
commit 61c7d71
Show file tree

Hide file tree

Showing 11 changed files with 7 additions and 32 deletions.
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
@@ -14,16 +14,12 @@
  * limitations under the License.
  */
 plugins {
-    alias(libs.plugins.nowinandroid.android.library)
-    alias(libs.plugins.nowinandroid.android.library.jacoco)
-    alias(libs.plugins.nowinandroid.android.hilt)
-}
-
-android {
-    namespace = "com.google.samples.apps.nowinandroid.core.common"
+    alias(libs.plugins.nowinandroid.jvm.library)
+    alias(libs.plugins.nowinandroid.jvm.hilt)
 }
 
 dependencies {
+    implementation(libs.kotlinx.coroutines.core)
     testImplementation(libs.kotlinx.coroutines.test)
     testImplementation(libs.turbine)
 }
diff --git a/core/common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xml
diff --git a/core/notifications/build.gradle.kts b/core/notifications/build.gradle.kts
@@ -28,5 +28,4 @@ dependencies {
     implementation(projects.core.common)
 
     compileOnly(platform(libs.androidx.compose.bom))
-    compileOnly(libs.androidx.compose.runtime)
 }
diff --git a/...main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt b/...main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
@@ -71,9 +71,7 @@ internal class SystemTrayNotifier @Inject constructor(
         val newsNotifications = truncatedNewsResources
             .map { newsResource ->
                 createNewsNotification {
-                    setSmallIcon(
-                        com.google.samples.apps.nowinandroid.core.common.R.drawable.core_common_ic_nia_notification,
-                    )
+                    setSmallIcon(R.drawable.core_notifications_ic_nia_notification)
                         .setContentTitle(newsResource.title)
                         .setContentText(newsResource.content)
                         .setContentIntent(newsPendingIntent(newsResource))
@@ -88,9 +86,7 @@ internal class SystemTrayNotifier @Inject constructor(
             )
             setContentTitle(title)
                 .setContentText(title)
-                .setSmallIcon(
-                    com.google.samples.apps.nowinandroid.core.common.R.drawable.core_common_ic_nia_notification,
-                )
+                .setSmallIcon(R.drawable.core_notifications_ic_nia_notification)
                 // Build summary info into InboxStyle template.
                 .setStyle(newsNotificationStyle(truncatedNewsResources, title))
                 .setGroup(NEWS_NOTIFICATION_GROUP)

diff --git a/...i-v24/core_common_ic_nia_notification.xml → ...ore_notifications_ic_nia_notification.xml b/...i-v24/core_common_ic_nia_notification.xml → ...ore_notifications_ic_nia_notification.xml
diff --git a/...-hdpi/core_common_ic_nia_notification.png → ...ore_notifications_ic_nia_notification.png b/...-hdpi/core_common_ic_nia_notification.png → ...ore_notifications_ic_nia_notification.png
diff --git a/...-mdpi/core_common_ic_nia_notification.png → ...ore_notifications_ic_nia_notification.png b/...-mdpi/core_common_ic_nia_notification.png → ...ore_notifications_ic_nia_notification.png
diff --git a/...xhdpi/core_common_ic_nia_notification.png → ...ore_notifications_ic_nia_notification.png b/...xhdpi/core_common_ic_nia_notification.png → ...ore_notifications_ic_nia_notification.png
diff --git a/...xhdpi/core_common_ic_nia_notification.png → ...ore_notifications_ic_nia_notification.png b/...xhdpi/core_common_ic_nia_notification.png → ...ore_notifications_ic_nia_notification.png
diff --git a/sync/work/build.gradle.kts b/sync/work/build.gradle.kts
@@ -34,6 +34,7 @@ dependencies {
     implementation(libs.hilt.ext.work)
     implementation(projects.core.analytics)
     implementation(projects.core.data)
+    implementation(projects.core.notifications)
 
     prodImplementation(libs.firebase.cloud.messaging)
     prodImplementation(platform(libs.firebase.bom))

diff --git a/...src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt b/...src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt
@@ -71,7 +71,7 @@ private fun Context.syncWorkNotification(): Notification {
         SYNC_NOTIFICATION_CHANNEL_ID,
     )
         .setSmallIcon(
-            com.google.samples.apps.nowinandroid.core.common.R.drawable.core_common_ic_nia_notification,
+            com.google.samples.apps.nowinandroid.core.notifications.R.drawable.core_notifications_ic_nia_notification,
         )
         .setContentTitle(getString(R.string.sync_work_notification_title))
         .setPriority(NotificationCompat.PRIORITY_DEFAULT)