A fully functional Android app built entirely with Kotlin and Jetpack Compose
Move 'core-' module to core subfolder
madroid3bd81154b51a
diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.ktsindex 26eb06969..88b105542 100644--- a/app-nia-catalog/build.gradle.kts+++ b/app-nia-catalog/build.gradle.kts@@ -36,8 +36,8 @@ android {}dependencies {- implementation(project(":core-ui"))- implementation(project(":core-designsystem"))+ implementation(project(":core:ui"))+ implementation(project(":core:designsystem"))implementation(libs.androidx.activity.compose)implementation(libs.accompanist.flowlayout)diff --git a/app/build.gradle.kts b/app/build.gradle.ktsindex 0ce7872b3..393353e78 100644--- a/app/build.gradle.kts+++ b/app/build.gradle.kts@@ -99,16 +99,16 @@ dependencies {implementation(project(":feature-bookmarks"))implementation(project(":feature-topic"))- implementation(project(":core-ui"))- implementation(project(":core-designsystem"))- implementation(project(":core-navigation"))+ implementation(project(":core:ui"))+ implementation(project(":core:designsystem"))+ implementation(project(":core:navigation"))implementation(project(":sync"))- androidTestImplementation(project(":core-testing"))- androidTestImplementation(project(":core-datastore-test"))- androidTestImplementation(project(":core-data-test"))- androidTestImplementation(project(":core-network"))+ androidTestImplementation(project(":core:testing"))+ androidTestImplementation(project(":core:datastore-test"))+ androidTestImplementation(project(":core:data-test"))+ androidTestImplementation(project(":core:network"))androidTestImplementation(libs.androidx.navigation.testing)debugImplementation(libs.androidx.compose.ui.testManifest)diff --git a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.ktindex 3cbb1d23f..934a38af1 100644--- a/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt+++ b/build-logic/convention/src/main/kotlin/AndroidFeatureConventionPlugin.kt@@ -40,15 +40,15 @@ class AndroidFeatureConventionPlugin : Plugin<Project> {val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")dependencies {- add("implementation", project(":core-model"))- add("implementation", project(":core-ui"))- add("implementation", project(":core-designsystem"))- add("implementation", project(":core-data"))- add("implementation", project(":core-common"))- add("implementation", project(":core-navigation"))+ add("implementation", project(":core:model"))+ add("implementation", project(":core:ui"))+ add("implementation", project(":core:designsystem"))+ add("implementation", project(":core:data"))+ add("implementation", project(":core:common"))+ add("implementation", project(":core:navigation"))- add("testImplementation", project(":core-testing"))- add("androidTestImplementation", project(":core-testing"))+ add("testImplementation", project(":core:testing"))+ add("androidTestImplementation", project(":core:testing"))add("implementation", libs.findLibrary("coil.kt").get())add("implementation", libs.findLibrary("coil.kt.compose").get())diff --git a/core-common/.gitignore b/core/common/.gitignoresimilarity index 100%rename from core-common/.gitignorerename to core/common/.gitignorediff --git a/core-common/build.gradle.kts b/core/common/build.gradle.ktssimilarity index 94%rename from core-common/build.gradle.ktsrename to core/common/build.gradle.ktsindex a04464ef0..0957177c2 100644--- a/core-common/build.gradle.kts+++ b/core/common/build.gradle.kts@@ -25,5 +25,5 @@ dependencies {implementation(libs.hilt.android)kapt(libs.hilt.compiler)- testImplementation(project(":core-testing"))+ testImplementation(project(":core:testing"))}\ No newline at end of filediff --git a/core-common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-common/src/main/AndroidManifest.xmlrename to core/common/src/main/AndroidManifest.xmldiff --git a/core-common/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaDispatchers.kt b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaDispatchers.ktsimilarity index 100%rename from core-common/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaDispatchers.ktrename to core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaDispatchers.ktdiff --git a/core-common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/DispatchersModule.kt b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/DispatchersModule.ktsimilarity index 100%rename from core-common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/DispatchersModule.ktrename to core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/DispatchersModule.ktdiff --git a/core-common/src/main/java/com/google/samples/apps/nowinandroid/core/result/Result.kt b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/result/Result.ktsimilarity index 100%rename from core-common/src/main/java/com/google/samples/apps/nowinandroid/core/result/Result.ktrename to core/common/src/main/java/com/google/samples/apps/nowinandroid/core/result/Result.ktdiff --git a/core-common/src/main/res/drawable-anydpi-v24/ic_nia_notification.xml b/core/common/src/main/res/drawable-anydpi-v24/ic_nia_notification.xmlsimilarity index 100%rename from core-common/src/main/res/drawable-anydpi-v24/ic_nia_notification.xmlrename to core/common/src/main/res/drawable-anydpi-v24/ic_nia_notification.xmldiff --git a/core-common/src/main/res/drawable-hdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-hdpi/ic_nia_notification.pngsimilarity index 100%rename from core-common/src/main/res/drawable-hdpi/ic_nia_notification.pngrename to core/common/src/main/res/drawable-hdpi/ic_nia_notification.pngdiff --git a/core-common/src/main/res/drawable-mdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-mdpi/ic_nia_notification.pngsimilarity index 100%rename from core-common/src/main/res/drawable-mdpi/ic_nia_notification.pngrename to core/common/src/main/res/drawable-mdpi/ic_nia_notification.pngdiff --git a/core-common/src/main/res/drawable-xhdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-xhdpi/ic_nia_notification.pngsimilarity index 100%rename from core-common/src/main/res/drawable-xhdpi/ic_nia_notification.pngrename to core/common/src/main/res/drawable-xhdpi/ic_nia_notification.pngdiff --git a/core-common/src/main/res/drawable-xxhdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-xxhdpi/ic_nia_notification.pngsimilarity index 100%rename from core-common/src/main/res/drawable-xxhdpi/ic_nia_notification.pngrename to core/common/src/main/res/drawable-xxhdpi/ic_nia_notification.pngdiff --git a/core-common/src/test/java/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt b/core/common/src/test/java/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.ktsimilarity index 100%rename from core-common/src/test/java/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.ktrename to core/common/src/test/java/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.ktdiff --git a/core-data-test/.gitignore b/core/data-test/.gitignoresimilarity index 100%rename from core-data-test/.gitignorerename to core/data-test/.gitignorediff --git a/core-data-test/build.gradle.kts b/core/data-test/build.gradle.ktssimilarity index 92%rename from core-data-test/build.gradle.ktsrename to core/data-test/build.gradle.ktsindex df4796506..a55fc05bd 100644--- a/core-data-test/build.gradle.kts+++ b/core/data-test/build.gradle.kts@@ -21,8 +21,8 @@ plugins {}dependencies {- api(project(":core-data"))- implementation(project(":core-testing"))+ api(project(":core:data"))+ implementation(project(":core:testing"))implementation(libs.hilt.android)kapt(libs.hilt.compiler)diff --git a/core-data-test/src/main/AndroidManifest.xml b/core/data-test/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-data-test/src/main/AndroidManifest.xmlrename to core/data-test/src/main/AndroidManifest.xmldiff --git a/core-data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt b/core/data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.ktsimilarity index 100%rename from core-data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.ktrename to core/data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.ktdiff --git a/core-data/.gitignore b/core/data/.gitignoresimilarity index 100%rename from core-data/.gitignorerename to core/data/.gitignorediff --git a/core-data/build.gradle.kts b/core/data/build.gradle.ktssimilarity index 76%rename from core-data/build.gradle.ktsrename to core/data/build.gradle.ktsindex 66fa5bcb4..b1fa8ef04 100644--- a/core-data/build.gradle.kts+++ b/core/data/build.gradle.kts@@ -23,14 +23,14 @@ plugins {}dependencies {- implementation(project(":core-common"))- implementation(project(":core-model"))- implementation(project(":core-database"))- implementation(project(":core-datastore"))- implementation(project(":core-network"))+ implementation(project(":core:common"))+ implementation(project(":core:model"))+ implementation(project(":core:database"))+ implementation(project(":core:datastore"))+ implementation(project(":core:network"))- testImplementation(project(":core-testing"))- testImplementation(project(":core-datastore-test"))+ testImplementation(project(":core:testing"))+ testImplementation(project(":core:datastore-test"))implementation(libs.kotlinx.datetime)implementation(libs.kotlinx.coroutines.android)diff --git a/core-data/src/main/AndroidManifest.xml b/core/data/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-data/src/main/AndroidManifest.xmlrename to core/data/src/main/AndroidManifest.xmldiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.ktdiff --git a/core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeUserDataRepository.kt b/core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeUserDataRepository.ktsimilarity index 100%rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeUserDataRepository.ktrename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeUserDataRepository.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.ktdiff --git a/core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.kt b/core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.ktsimilarity index 100%rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.ktrename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.ktdiff --git a/core-database/.gitignore b/core/database/.gitignoresimilarity index 100%rename from core-database/.gitignorerename to core/database/.gitignorediff --git a/core-database/build.gradle.kts b/core/database/build.gradle.ktssimilarity index 94%rename from core-database/build.gradle.ktsrename to core/database/build.gradle.ktsindex a890f4395..0554bee55 100644--- a/core-database/build.gradle.kts+++ b/core/database/build.gradle.kts@@ -38,7 +38,7 @@ android {}dependencies {- implementation(project(":core-model"))+ implementation(project(":core:model"))implementation(libs.room.runtime)implementation(libs.room.ktx)@@ -50,5 +50,5 @@ dependencies {implementation(libs.hilt.android)kapt(libs.hilt.compiler)- androidTestImplementation(project(":core-testing"))+ androidTestImplementation(project(":core:testing"))}\ No newline at end of filediff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/1.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/1.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/1.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/1.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/10.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/10.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/10.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/10.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/2.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/2.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/2.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/2.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/3.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/3.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/3.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/3.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/4.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/4.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/4.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/4.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/5.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/5.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/5.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/5.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/6.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/6.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/6.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/6.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/7.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/7.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/7.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/7.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/8.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/8.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/8.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/8.jsondiff --git a/core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/9.json b/core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/9.jsonsimilarity index 100%rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/9.jsonrename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/9.jsondiff --git a/core-database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt b/core/database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.ktsimilarity index 100%rename from core-database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.ktrename to core/database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.ktdiff --git a/core-database/src/main/AndroidManifest.xml b/core/database/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-database/src/main/AndroidManifest.xmlrename to core/database/src/main/AndroidManifest.xmldiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseMigrations.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseMigrations.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseMigrations.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseMigrations.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/AuthorDao.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/AuthorDao.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/AuthorDao.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/AuthorDao.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/EpisodeDao.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/EpisodeDao.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/EpisodeDao.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/EpisodeDao.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/UpsertHelper.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/UpsertHelper.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/UpsertHelper.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/UpsertHelper.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/AuthorEntity.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/AuthorEntity.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/AuthorEntity.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/AuthorEntity.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeAuthorCrossRef.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeAuthorCrossRef.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeAuthorCrossRef.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeAuthorCrossRef.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeEntity.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeEntity.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeEntity.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeEntity.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceAuthorCrossRef.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceAuthorCrossRef.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceAuthorCrossRef.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceAuthorCrossRef.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceEntity.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceEntity.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceEntity.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceEntity.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisode.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisode.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisode.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisode.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/TopicEntity.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/TopicEntity.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/TopicEntity.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/TopicEntity.ktdiff --git a/core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/Converters.kt b/core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/Converters.ktsimilarity index 100%rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/Converters.ktrename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/Converters.ktdiff --git a/core-datastore-test/.gitignore b/core/datastore-test/.gitignoresimilarity index 100%rename from core-datastore-test/.gitignorerename to core/datastore-test/.gitignorediff --git a/core-datastore-test/build.gradle.kts b/core/datastore-test/build.gradle.ktssimilarity index 91%rename from core-datastore-test/build.gradle.ktsrename to core/datastore-test/build.gradle.ktsindex 068586022..f16d5c617 100644--- a/core-datastore-test/build.gradle.kts+++ b/core/datastore-test/build.gradle.kts@@ -21,8 +21,8 @@ plugins {}dependencies {- api(project(":core-datastore"))- implementation(project(":core-testing"))+ api(project(":core:datastore"))+ implementation(project(":core:testing"))api(libs.androidx.dataStore.core)diff --git a/core-datastore-test/src/main/AndroidManifest.xml b/core/datastore-test/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-datastore-test/src/main/AndroidManifest.xmlrename to core/datastore-test/src/main/AndroidManifest.xmldiff --git a/core-datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt b/core/datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.ktsimilarity index 100%rename from core-datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.ktrename to core/datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.ktdiff --git a/core-datastore/.gitignore b/core/datastore/.gitignoresimilarity index 100%rename from core-datastore/.gitignorerename to core/datastore/.gitignorediff --git a/core-datastore/build.gradle.kts b/core/datastore/build.gradle.ktssimilarity index 93%rename from core-datastore/build.gradle.ktsrename to core/datastore/build.gradle.ktsindex a554a6de2..623f52549 100644--- a/core-datastore/build.gradle.kts+++ b/core/datastore/build.gradle.kts@@ -56,10 +56,10 @@ protobuf {}dependencies {- implementation(project(":core-common"))- implementation(project(":core-model"))+ implementation(project(":core:common"))+ implementation(project(":core:model"))- testImplementation(project(":core-testing"))+ testImplementation(project(":core:testing"))implementation(libs.kotlinx.coroutines.android)diff --git a/core-datastore/consumer-proguard-rules.pro b/core/datastore/consumer-proguard-rules.prosimilarity index 100%rename from core-datastore/consumer-proguard-rules.prorename to core/datastore/consumer-proguard-rules.prodiff --git a/core-datastore/src/main/AndroidManifest.xml b/core/datastore/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-datastore/src/main/AndroidManifest.xmlrename to core/datastore/src/main/AndroidManifest.xmldiff --git a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/ChangeListVersions.kt b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/ChangeListVersions.ktsimilarity index 100%rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/ChangeListVersions.ktrename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/ChangeListVersions.ktdiff --git a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigration.kt b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigration.ktsimilarity index 100%rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigration.ktrename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigration.ktdiff --git a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.ktsimilarity index 100%rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.ktrename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.ktdiff --git a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializer.kt b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializer.ktsimilarity index 100%rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializer.ktrename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializer.ktdiff --git a/core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt b/core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.ktsimilarity index 100%rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.ktrename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.ktdiff --git a/core-datastore/src/main/proto/com/google/samples/apps/nowinandroid/data/user_preferences.proto b/core/datastore/src/main/proto/com/google/samples/apps/nowinandroid/data/user_preferences.protosimilarity index 100%rename from core-datastore/src/main/proto/com/google/samples/apps/nowinandroid/data/user_preferences.protorename to core/datastore/src/main/proto/com/google/samples/apps/nowinandroid/data/user_preferences.protodiff --git a/core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.kt b/core/datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.ktsimilarity index 100%rename from core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.ktrename to core/datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.ktdiff --git a/core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.kt b/core/datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.ktsimilarity index 100%rename from core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.ktrename to core/datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.ktdiff --git a/core-designsystem/.gitignore b/core/designsystem/.gitignoresimilarity index 100%rename from core-designsystem/.gitignorerename to core/designsystem/.gitignorediff --git a/core-designsystem/build.gradle.kts b/core/designsystem/build.gradle.ktssimilarity index 96%rename from core-designsystem/build.gradle.ktsrename to core/designsystem/build.gradle.ktsindex 053081bbf..23a1914c8 100644--- a/core-designsystem/build.gradle.kts+++ b/core/designsystem/build.gradle.kts@@ -40,7 +40,7 @@ dependencies {api(libs.androidx.compose.ui.util)api(libs.androidx.compose.runtime)lintPublish(project(":lint"))- androidTestImplementation(project(":core-testing"))+ androidTestImplementation(project(":core:testing"))// TODO : Remove these dependency once we upgrade to Android Studio Dolphin b/228889042// These dependencies are currently necessary to render Compose previewsdiff --git a/core-designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt b/core/designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.ktsimilarity index 100%rename from core-designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.ktrename to core/designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.ktdiff --git a/core-designsystem/src/main/AndroidManifest.xml b/core/designsystem/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-designsystem/src/main/AndroidManifest.xmlrename to core/designsystem/src/main/AndroidManifest.xmldiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ToggleButton.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ToggleButton.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ToggleButton.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ToggleButton.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.ktdiff --git a/core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt b/core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.ktsimilarity index 100%rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.ktrename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.ktdiff --git a/core-designsystem/src/main/res/drawable/ic_bookmark.xml b/core/designsystem/src/main/res/drawable/ic_bookmark.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_bookmark.xmlrename to core/designsystem/src/main/res/drawable/ic_bookmark.xmldiff --git a/core-designsystem/src/main/res/drawable/ic_bookmark_border.xml b/core/designsystem/src/main/res/drawable/ic_bookmark_border.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_bookmark_border.xmlrename to core/designsystem/src/main/res/drawable/ic_bookmark_border.xmldiff --git a/core-designsystem/src/main/res/drawable/ic_bookmarks.xml b/core/designsystem/src/main/res/drawable/ic_bookmarks.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_bookmarks.xmlrename to core/designsystem/src/main/res/drawable/ic_bookmarks.xmldiff --git a/core-designsystem/src/main/res/drawable/ic_bookmarks_border.xml b/core/designsystem/src/main/res/drawable/ic_bookmarks_border.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_bookmarks_border.xmlrename to core/designsystem/src/main/res/drawable/ic_bookmarks_border.xmldiff --git a/core-designsystem/src/main/res/drawable/ic_menu_book.xml b/core/designsystem/src/main/res/drawable/ic_menu_book.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_menu_book.xmlrename to core/designsystem/src/main/res/drawable/ic_menu_book.xmldiff --git a/core-designsystem/src/main/res/drawable/ic_menu_book_border.xml b/core/designsystem/src/main/res/drawable/ic_menu_book_border.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_menu_book_border.xmlrename to core/designsystem/src/main/res/drawable/ic_menu_book_border.xmldiff --git a/core-designsystem/src/main/res/drawable/ic_placeholder_default.xml b/core/designsystem/src/main/res/drawable/ic_placeholder_default.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_placeholder_default.xmlrename to core/designsystem/src/main/res/drawable/ic_placeholder_default.xmldiff --git a/core-designsystem/src/main/res/drawable/ic_upcoming.xml b/core/designsystem/src/main/res/drawable/ic_upcoming.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_upcoming.xmlrename to core/designsystem/src/main/res/drawable/ic_upcoming.xmldiff --git a/core-designsystem/src/main/res/drawable/ic_upcoming_border.xml b/core/designsystem/src/main/res/drawable/ic_upcoming_border.xmlsimilarity index 100%rename from core-designsystem/src/main/res/drawable/ic_upcoming_border.xmlrename to core/designsystem/src/main/res/drawable/ic_upcoming_border.xmldiff --git a/core-designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xmlsimilarity index 100%rename from core-designsystem/src/main/res/values/strings.xmlrename to core/designsystem/src/main/res/values/strings.xmldiff --git a/core-model/.gitignore b/core/model/.gitignoresimilarity index 100%rename from core-model/.gitignorerename to core/model/.gitignorediff --git a/core-model/build.gradle.kts b/core/model/build.gradle.ktssimilarity index 100%rename from core-model/build.gradle.ktsrename to core/model/build.gradle.ktsdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Author.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Author.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Author.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Author.ktdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Episode.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Episode.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Episode.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Episode.ktdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableAuthor.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableAuthor.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableAuthor.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableAuthor.ktdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.ktdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.ktdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceType.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceType.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceType.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceType.ktdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/SaveableNewsResource.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/SaveableNewsResource.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/SaveableNewsResource.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/SaveableNewsResource.ktdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.ktdiff --git a/core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/UserData.kt b/core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/UserData.ktsimilarity index 100%rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/UserData.ktrename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/UserData.ktdiff --git a/core-navigation/.gitignore b/core/navigation/.gitignoresimilarity index 100%rename from core-navigation/.gitignorerename to core/navigation/.gitignorediff --git a/core-navigation/build.gradle.kts b/core/navigation/build.gradle.ktssimilarity index 100%rename from core-navigation/build.gradle.ktsrename to core/navigation/build.gradle.ktsdiff --git a/core-navigation/src/main/AndroidManifest.xml b/core/navigation/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-navigation/src/main/AndroidManifest.xmlrename to core/navigation/src/main/AndroidManifest.xmldiff --git a/core-navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.kt b/core/navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.ktsimilarity index 100%rename from core-navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.ktrename to core/navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.ktdiff --git a/core-network/.gitignore b/core/network/.gitignoresimilarity index 100%rename from core-network/.gitignorerename to core/network/.gitignorediff --git a/core-network/build.gradle.kts b/core/network/build.gradle.ktssimilarity index 90%rename from core-network/build.gradle.ktsrename to core/network/build.gradle.ktsindex b629a16e0..3c2303185 100644--- a/core-network/build.gradle.kts+++ b/core/network/build.gradle.kts@@ -28,10 +28,10 @@ secrets {}dependencies {- implementation(project(":core-common"))- implementation(project(":core-model"))+ implementation(project(":core:common"))+ implementation(project(":core:model"))- testImplementation(project(":core-testing"))+ testImplementation(project(":core:testing"))implementation(libs.kotlinx.coroutines.android)implementation(libs.kotlinx.serialization.json)diff --git a/core-network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktsimilarity index 100%rename from core-network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktrename to core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktdiff --git a/core-network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktsimilarity index 100%rename from core-network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktrename to core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktdiff --git a/core-network/src/main/AndroidManifest.xml b/core/network/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-network/src/main/AndroidManifest.xmlrename to core/network/src/main/AndroidManifest.xmldiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetworkDataSource.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetworkDataSource.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetworkDataSource.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetworkDataSource.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeDataSource.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeDataSource.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeDataSource.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeDataSource.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkAuthor.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkAuthor.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkAuthor.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkAuthor.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkChangeList.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkChangeList.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkChangeList.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkChangeList.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkEpisode.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkEpisode.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkEpisode.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkEpisode.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkNewsResource.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkNewsResource.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkNewsResource.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkNewsResource.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkTopic.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkTopic.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkTopic.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkTopic.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/InstantSerializer.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/InstantSerializer.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/InstantSerializer.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/InstantSerializer.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializer.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializer.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializer.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializer.ktdiff --git a/core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt b/core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.ktsimilarity index 100%rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.ktrename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.ktdiff --git a/core-network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt b/core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktsimilarity index 100%rename from core-network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktrename to core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.ktdiff --git a/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt b/core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.ktsimilarity index 100%rename from core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.ktrename to core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.ktdiff --git a/core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializerTest.kt b/core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializerTest.ktsimilarity index 100%rename from core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializerTest.ktrename to core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializerTest.ktdiff --git a/core-testing/.gitignore b/core/testing/.gitignoresimilarity index 100%rename from core-testing/.gitignorerename to core/testing/.gitignorediff --git a/core-testing/build.gradle.kts b/core/testing/build.gradle.ktssimilarity index 89%rename from core-testing/build.gradle.ktsrename to core/testing/build.gradle.ktsindex 471700ccc..e71d82ef8 100644--- a/core-testing/build.gradle.kts+++ b/core/testing/build.gradle.kts@@ -20,9 +20,9 @@ plugins {}dependencies {- implementation(project(":core-common"))- implementation(project(":core-data"))- implementation(project(":core-model"))+ implementation(project(":core:common"))+ implementation(project(":core:data"))+ implementation(project(":core:model"))implementation(libs.hilt.android)kapt(libs.hilt.compiler)diff --git a/core-testing/src/main/AndroidManifest.xml b/core/testing/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-testing/src/main/AndroidManifest.xmlrename to core/testing/src/main/AndroidManifest.xmldiff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.ktsimilarity index 100%rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.ktrename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.ktdiff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.ktsimilarity index 100%rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.ktrename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.ktdiff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.ktsimilarity index 100%rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.ktrename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.ktdiff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.ktsimilarity index 100%rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.ktrename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.ktdiff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.ktsimilarity index 100%rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.ktrename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.ktdiff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.ktsimilarity index 100%rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.ktrename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.ktdiff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.ktsimilarity index 100%rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.ktrename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.ktdiff --git a/core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt b/core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.ktsimilarity index 100%rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.ktrename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.ktdiff --git a/core-ui/.gitignore b/core/ui/.gitignoresimilarity index 100%rename from core-ui/.gitignorerename to core/ui/.gitignorediff --git a/core-ui/build.gradle.kts b/core/ui/build.gradle.ktssimilarity index 95%rename from core-ui/build.gradle.ktsrename to core/ui/build.gradle.ktsindex 597440d85..47dd778ca 100644--- a/core-ui/build.gradle.kts+++ b/core/ui/build.gradle.kts@@ -21,8 +21,8 @@ plugins {}dependencies {- implementation(project(":core-designsystem"))- implementation(project(":core-model"))+ implementation(project(":core:designsystem"))+ implementation(project(":core:model"))implementation(libs.androidx.core.ktx)implementation(libs.coil.kt)diff --git a/core-ui/src/main/AndroidManifest.xml b/core/ui/src/main/AndroidManifest.xmlsimilarity index 100%rename from core-ui/src/main/AndroidManifest.xmlrename to core/ui/src/main/AndroidManifest.xmldiff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.ktsimilarity index 100%rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.ktrename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.ktdiff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.ktsimilarity index 100%rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.ktrename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.ktdiff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktsimilarity index 100%rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktrename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.ktdiff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.ktsimilarity index 100%rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.ktrename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.ktdiff --git a/core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/TimeZoneBroadcastReceiver.kt b/core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/TimeZoneBroadcastReceiver.ktsimilarity index 100%rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/TimeZoneBroadcastReceiver.ktrename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/TimeZoneBroadcastReceiver.ktdiff --git a/core-ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xmlsimilarity index 100%rename from core-ui/src/main/res/values/strings.xmlrename to core/ui/src/main/res/values/strings.xmldiff --git a/settings.gradle.kts b/settings.gradle.ktsindex 3393b4879..30eccde47 100644--- a/settings.gradle.kts+++ b/settings.gradle.kts@@ -43,18 +43,18 @@ rootProject.name = "nowinandroid"include(":app")include(":app-nia-catalog")include(":benchmark")-include(":core-common")-include(":core-data")-include(":core-data-test")-include(":core-database")-include(":core-datastore")-include(":core-datastore-test")-include(":core-designsystem")-include(":core-model")-include(":core-navigation")-include(":core-network")-include(":core-ui")-include(":core-testing")+include(":core:common")+include(":core:data")+include(":core:data-test")+include(":core:database")+include(":core:datastore")+include(":core:datastore-test")+include(":core:designsystem")+include(":core:model")+include(":core:navigation")+include(":core:network")+include(":core:ui")+include(":core:testing")include(":feature-author")include(":feature-foryou")include(":feature-interests")diff --git a/sync/build.gradle.kts b/sync/build.gradle.ktsindex 02cae2c55..8e24d955e 100644--- a/sync/build.gradle.kts+++ b/sync/build.gradle.kts@@ -28,10 +28,10 @@ android {}dependencies {- implementation(project(":core-common"))- implementation(project(":core-model"))- implementation(project(":core-data"))- implementation(project(":core-datastore"))+ implementation(project(":core:common"))+ implementation(project(":core:model"))+ implementation(project(":core:data"))+ implementation(project(":core:datastore"))implementation(libs.kotlinx.coroutines.android)@@ -40,8 +40,8 @@ dependencies {implementation(libs.androidx.work.ktx)implementation(libs.hilt.ext.work)- testImplementation(project(":core-testing"))- androidTestImplementation(project(":core-testing"))+ testImplementation(project(":core:testing"))+ androidTestImplementation(project(":core:testing"))implementation(libs.hilt.android)kapt(libs.hilt.compiler)