Skip to content

A fully functional Android app built entirely with Kotlin and Jetpack Compose

Migrate `:core:common` to pure JVM module

Simon Marquis61c7d71870bc
diff --git a/core/common/build.gradle.kts b/core/common/build.gradle.kts
index 51ae627dc..94dd3c09e 100644
--- 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)
}
\ No newline at end of file
diff --git a/core/common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xml
deleted file mode 100644
index 51d0cfc2e..000000000
--- a/core/common/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
- Copyright 2022 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<manifest />
\ No newline at end of file
diff --git a/core/notifications/build.gradle.kts b/core/notifications/build.gradle.kts
index 92871b72b..7b0f14fc8 100644
--- 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/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt b/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
index ebad9fda3..38d905ad1 100644
--- a/core/notifications/src/main/kotlin/com/google/samples/apps/nowinandroid/core/notifications/SystemTrayNotifier.kt
+++ b/core/notifications/src/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/core/common/src/main/res/drawable-anydpi-v24/core_common_ic_nia_notification.xml b/core/notifications/src/main/res/drawable-anydpi-v24/core_notifications_ic_nia_notification.xml
similarity index 100%
rename from core/common/src/main/res/drawable-anydpi-v24/core_common_ic_nia_notification.xml
rename to core/notifications/src/main/res/drawable-anydpi-v24/core_notifications_ic_nia_notification.xml
diff --git a/core/common/src/main/res/drawable-hdpi/core_common_ic_nia_notification.png b/core/notifications/src/main/res/drawable-hdpi/core_notifications_ic_nia_notification.png
similarity index 100%
rename from core/common/src/main/res/drawable-hdpi/core_common_ic_nia_notification.png
rename to core/notifications/src/main/res/drawable-hdpi/core_notifications_ic_nia_notification.png
diff --git a/core/common/src/main/res/drawable-mdpi/core_common_ic_nia_notification.png b/core/notifications/src/main/res/drawable-mdpi/core_notifications_ic_nia_notification.png
similarity index 100%
rename from core/common/src/main/res/drawable-mdpi/core_common_ic_nia_notification.png
rename to core/notifications/src/main/res/drawable-mdpi/core_notifications_ic_nia_notification.png
diff --git a/core/common/src/main/res/drawable-xhdpi/core_common_ic_nia_notification.png b/core/notifications/src/main/res/drawable-xhdpi/core_notifications_ic_nia_notification.png
similarity index 100%
rename from core/common/src/main/res/drawable-xhdpi/core_common_ic_nia_notification.png
rename to core/notifications/src/main/res/drawable-xhdpi/core_notifications_ic_nia_notification.png
diff --git a/core/common/src/main/res/drawable-xxhdpi/core_common_ic_nia_notification.png b/core/notifications/src/main/res/drawable-xxhdpi/core_notifications_ic_nia_notification.png
similarity index 100%
rename from core/common/src/main/res/drawable-xxhdpi/core_common_ic_nia_notification.png
rename to core/notifications/src/main/res/drawable-xxhdpi/core_notifications_ic_nia_notification.png
diff --git a/sync/work/build.gradle.kts b/sync/work/build.gradle.kts
index 7e61c7389..1bcc15964 100644
--- 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/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt b/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt
index 843510aaf..6c4a29373 100644
--- a/sync/work/src/main/kotlin/com/google/samples/apps/nowinandroid/sync/initializers/SyncWorkHelpers.kt
+++ b/sync/work/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)