diff --git a/app-nia-catalog/build.gradle.kts b/app-nia-catalog/build.gradle.kts index 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.kts index 0ce7872b3..3a3afce25 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -93,22 +93,22 @@ android { } dependencies { - implementation(project(":feature-author")) - implementation(project(":feature-interests")) - implementation(project(":feature-foryou")) - implementation(project(":feature-bookmarks")) - implementation(project(":feature-topic")) + implementation(project(":feature:author")) + implementation(project(":feature:interests")) + implementation(project(":feature:foryou")) + 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.kt index 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 { val libs = extensions.getByType().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/.gitignore similarity index 100% rename from core-common/.gitignore rename to core/common/.gitignore diff --git a/core-common/build.gradle.kts b/core/common/build.gradle.kts similarity index 94% rename from core-common/build.gradle.kts rename to core/common/build.gradle.kts index 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 file diff --git a/core-common/src/main/AndroidManifest.xml b/core/common/src/main/AndroidManifest.xml similarity index 100% rename from core-common/src/main/AndroidManifest.xml rename to core/common/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-common/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaDispatchers.kt rename to core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaDispatchers.kt diff --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.kt similarity index 100% rename from core-common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/DispatchersModule.kt rename to core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/DispatchersModule.kt diff --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.kt similarity index 100% rename from core-common/src/main/java/com/google/samples/apps/nowinandroid/core/result/Result.kt rename to core/common/src/main/java/com/google/samples/apps/nowinandroid/core/result/Result.kt diff --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.xml similarity index 100% rename from core-common/src/main/res/drawable-anydpi-v24/ic_nia_notification.xml rename to core/common/src/main/res/drawable-anydpi-v24/ic_nia_notification.xml diff --git a/core-common/src/main/res/drawable-hdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-hdpi/ic_nia_notification.png similarity index 100% rename from core-common/src/main/res/drawable-hdpi/ic_nia_notification.png rename to core/common/src/main/res/drawable-hdpi/ic_nia_notification.png diff --git a/core-common/src/main/res/drawable-mdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-mdpi/ic_nia_notification.png similarity index 100% rename from core-common/src/main/res/drawable-mdpi/ic_nia_notification.png rename to core/common/src/main/res/drawable-mdpi/ic_nia_notification.png diff --git a/core-common/src/main/res/drawable-xhdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-xhdpi/ic_nia_notification.png similarity index 100% rename from core-common/src/main/res/drawable-xhdpi/ic_nia_notification.png rename to core/common/src/main/res/drawable-xhdpi/ic_nia_notification.png diff --git a/core-common/src/main/res/drawable-xxhdpi/ic_nia_notification.png b/core/common/src/main/res/drawable-xxhdpi/ic_nia_notification.png similarity index 100% rename from core-common/src/main/res/drawable-xxhdpi/ic_nia_notification.png rename to core/common/src/main/res/drawable-xxhdpi/ic_nia_notification.png diff --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.kt similarity index 100% rename from core-common/src/test/java/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt rename to core/common/src/test/java/com/google/samples/apps/nowinandroid/core/result/ResultKtTest.kt diff --git a/core-data-test/.gitignore b/core/data-test/.gitignore similarity index 100% rename from core-data-test/.gitignore rename to core/data-test/.gitignore diff --git a/core-data-test/build.gradle.kts b/core/data-test/build.gradle.kts similarity index 92% rename from core-data-test/build.gradle.kts rename to core/data-test/build.gradle.kts index 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.xml similarity index 100% rename from core-data-test/src/main/AndroidManifest.xml rename to core/data-test/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt rename to core/data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt diff --git a/core-data/.gitignore b/core/data/.gitignore similarity index 100% rename from core-data/.gitignore rename to core/data/.gitignore diff --git a/core-data/build.gradle.kts b/core/data/build.gradle.kts similarity index 76% rename from core-data/build.gradle.kts rename to core/data/build.gradle.kts index 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.xml similarity index 100% rename from core-data/src/main/AndroidManifest.xml rename to core/data/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/UserDataRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt diff --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.kt similarity index 100% rename from core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeUserDataRepository.kt rename to core/data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeUserDataRepository.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstAuthorsRepositoryTest.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstNewsRepositoryTest.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstTopicsRepositoryTest.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/OfflineFirstUserDataRepositoryTest.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetworkDataSource.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisodeKtTest.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResourceKtTest.kt diff --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.kt similarity index 100% rename from core-data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.kt rename to core/data/src/test/java/com/google/samples/apps/nowinandroid/core/database/util/NewsResourceTypeConverterTest.kt diff --git a/core-database/.gitignore b/core/database/.gitignore similarity index 100% rename from core-database/.gitignore rename to core/database/.gitignore diff --git a/core-database/build.gradle.kts b/core/database/build.gradle.kts similarity index 94% rename from core-database/build.gradle.kts rename to core/database/build.gradle.kts index 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 file diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/1.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/1.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/10.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/10.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/2.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/2.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/3.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/3.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/4.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/4.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/5.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/5.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/6.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/6.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/7.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/7.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/8.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/8.json diff --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.json similarity index 100% rename from core-database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/9.json rename to core/database/schemas/com.google.samples.apps.nowinandroid.core.database.NiaDatabase/9.json diff --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.kt similarity index 100% rename from core-database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt rename to core/database/src/androidTest/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDaoTest.kt diff --git a/core-database/src/main/AndroidManifest.xml b/core/database/src/main/AndroidManifest.xml similarity index 100% rename from core-database/src/main/AndroidManifest.xml rename to core/database/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DaosModule.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseMigrations.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseMigrations.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/DatabaseModule.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/NiaDatabase.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/AuthorDao.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/AuthorDao.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/EpisodeDao.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/EpisodeDao.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/NewsResourceDao.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/TopicDao.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/UpsertHelper.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/dao/UpsertHelper.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/AuthorEntity.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/AuthorEntity.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeAuthorCrossRef.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeAuthorCrossRef.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeEntity.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/EpisodeEntity.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceAuthorCrossRef.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceAuthorCrossRef.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceEntity.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceEntity.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/NewsResourceTopicCrossRef.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisode.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedEpisode.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/PopulatedNewsResource.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/TopicEntity.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/model/TopicEntity.kt diff --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.kt similarity index 100% rename from core-database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/Converters.kt rename to core/database/src/main/java/com/google/samples/apps/nowinandroid/core/database/util/Converters.kt diff --git a/core-datastore-test/.gitignore b/core/datastore-test/.gitignore similarity index 100% rename from core-datastore-test/.gitignore rename to core/datastore-test/.gitignore diff --git a/core-datastore-test/build.gradle.kts b/core/datastore-test/build.gradle.kts similarity index 91% rename from core-datastore-test/build.gradle.kts rename to core/datastore-test/build.gradle.kts index 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.xml similarity index 100% rename from core-datastore-test/src/main/AndroidManifest.xml rename to core/datastore-test/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt rename to core/datastore-test/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/test/TestDataStoreModule.kt diff --git a/core-datastore/.gitignore b/core/datastore/.gitignore similarity index 100% rename from core-datastore/.gitignore rename to core/datastore/.gitignore diff --git a/core-datastore/build.gradle.kts b/core/datastore/build.gradle.kts similarity index 93% rename from core-datastore/build.gradle.kts rename to core/datastore/build.gradle.kts index 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.pro similarity index 100% rename from core-datastore/consumer-proguard-rules.pro rename to core/datastore/consumer-proguard-rules.pro diff --git a/core-datastore/src/main/AndroidManifest.xml b/core/datastore/src/main/AndroidManifest.xml similarity index 100% rename from core-datastore/src/main/AndroidManifest.xml rename to core/datastore/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/ChangeListVersions.kt rename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/ChangeListVersions.kt diff --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.kt similarity index 100% rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigration.kt rename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigration.kt diff --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.kt similarity index 100% rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt rename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/NiaPreferencesDataSource.kt diff --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.kt similarity index 100% rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializer.kt rename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializer.kt diff --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.kt similarity index 100% rename from core-datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt rename to core/datastore/src/main/java/com/google/samples/apps/nowinandroid/core/datastore/di/DataStoreModule.kt diff --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.proto similarity index 100% rename from core-datastore/src/main/proto/com/google/samples/apps/nowinandroid/data/user_preferences.proto rename to core/datastore/src/main/proto/com/google/samples/apps/nowinandroid/data/user_preferences.proto diff --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.kt similarity index 100% rename from core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.kt rename to core/datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/IntToStringIdsMigrationTest.kt diff --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.kt similarity index 100% rename from core-datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.kt rename to core/datastore/src/test/java/com/google/samples/apps/nowinandroid/core/datastore/UserPreferencesSerializerTest.kt diff --git a/core-designsystem/.gitignore b/core/designsystem/.gitignore similarity index 100% rename from core-designsystem/.gitignore rename to core/designsystem/.gitignore diff --git a/core-designsystem/build.gradle.kts b/core/designsystem/build.gradle.kts similarity index 96% rename from core-designsystem/build.gradle.kts rename to core/designsystem/build.gradle.kts index 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 previews diff --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.kt similarity index 100% rename from core-designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt rename to core/designsystem/src/androidTest/java/com/google/samples/apps/nowinandroid/core/designsystem/ThemeTest.kt diff --git a/core-designsystem/src/main/AndroidManifest.xml b/core/designsystem/src/main/AndroidManifest.xml similarity index 100% rename from core-designsystem/src/main/AndroidManifest.xml rename to core/designsystem/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Background.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Button.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Chip.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/DropdownMenu.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/LoadingWheel.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Navigation.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tabs.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/Tag.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ToggleButton.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ToggleButton.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/TopAppBar.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/component/ViewToggle.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/icon/NiaIcons.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Background.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Color.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Gradient.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Theme.kt diff --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.kt similarity index 100% rename from core-designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt rename to core/designsystem/src/main/java/com/google/samples/apps/nowinandroid/core/designsystem/theme/Type.kt diff --git a/core-designsystem/src/main/res/drawable/ic_bookmark.xml b/core/designsystem/src/main/res/drawable/ic_bookmark.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_bookmark.xml rename to core/designsystem/src/main/res/drawable/ic_bookmark.xml diff --git a/core-designsystem/src/main/res/drawable/ic_bookmark_border.xml b/core/designsystem/src/main/res/drawable/ic_bookmark_border.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_bookmark_border.xml rename to core/designsystem/src/main/res/drawable/ic_bookmark_border.xml diff --git a/core-designsystem/src/main/res/drawable/ic_bookmarks.xml b/core/designsystem/src/main/res/drawable/ic_bookmarks.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_bookmarks.xml rename to core/designsystem/src/main/res/drawable/ic_bookmarks.xml diff --git a/core-designsystem/src/main/res/drawable/ic_bookmarks_border.xml b/core/designsystem/src/main/res/drawable/ic_bookmarks_border.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_bookmarks_border.xml rename to core/designsystem/src/main/res/drawable/ic_bookmarks_border.xml diff --git a/core-designsystem/src/main/res/drawable/ic_menu_book.xml b/core/designsystem/src/main/res/drawable/ic_menu_book.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_menu_book.xml rename to core/designsystem/src/main/res/drawable/ic_menu_book.xml diff --git a/core-designsystem/src/main/res/drawable/ic_menu_book_border.xml b/core/designsystem/src/main/res/drawable/ic_menu_book_border.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_menu_book_border.xml rename to core/designsystem/src/main/res/drawable/ic_menu_book_border.xml diff --git a/core-designsystem/src/main/res/drawable/ic_placeholder_default.xml b/core/designsystem/src/main/res/drawable/ic_placeholder_default.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_placeholder_default.xml rename to core/designsystem/src/main/res/drawable/ic_placeholder_default.xml diff --git a/core-designsystem/src/main/res/drawable/ic_upcoming.xml b/core/designsystem/src/main/res/drawable/ic_upcoming.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_upcoming.xml rename to core/designsystem/src/main/res/drawable/ic_upcoming.xml diff --git a/core-designsystem/src/main/res/drawable/ic_upcoming_border.xml b/core/designsystem/src/main/res/drawable/ic_upcoming_border.xml similarity index 100% rename from core-designsystem/src/main/res/drawable/ic_upcoming_border.xml rename to core/designsystem/src/main/res/drawable/ic_upcoming_border.xml diff --git a/core-designsystem/src/main/res/values/strings.xml b/core/designsystem/src/main/res/values/strings.xml similarity index 100% rename from core-designsystem/src/main/res/values/strings.xml rename to core/designsystem/src/main/res/values/strings.xml diff --git a/core-model/.gitignore b/core/model/.gitignore similarity index 100% rename from core-model/.gitignore rename to core/model/.gitignore diff --git a/core-model/build.gradle.kts b/core/model/build.gradle.kts similarity index 100% rename from core-model/build.gradle.kts rename to core/model/build.gradle.kts diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Author.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Author.kt diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Episode.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Episode.kt diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableAuthor.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableAuthor.kt diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/FollowableTopic.kt diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResource.kt diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceType.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/NewsResourceType.kt diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/SaveableNewsResource.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/SaveableNewsResource.kt diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/Topic.kt diff --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.kt similarity index 100% rename from core-model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/UserData.kt rename to core/model/src/main/java/com/google/samples/apps/nowinandroid/core/model/data/UserData.kt diff --git a/core-navigation/.gitignore b/core/navigation/.gitignore similarity index 100% rename from core-navigation/.gitignore rename to core/navigation/.gitignore diff --git a/core-navigation/build.gradle.kts b/core/navigation/build.gradle.kts similarity index 100% rename from core-navigation/build.gradle.kts rename to core/navigation/build.gradle.kts diff --git a/core-navigation/src/main/AndroidManifest.xml b/core/navigation/src/main/AndroidManifest.xml similarity index 100% rename from core-navigation/src/main/AndroidManifest.xml rename to core/navigation/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.kt rename to core/navigation/src/main/java/com/google/samples/apps/nowinandroid/core/navigation/NiaNavigationDestination.kt diff --git a/core-network/.gitignore b/core/network/.gitignore similarity index 100% rename from core-network/.gitignore rename to core/network/.gitignore diff --git a/core-network/build.gradle.kts b/core/network/build.gradle.kts similarity index 90% rename from core-network/build.gradle.kts rename to core/network/build.gradle.kts index 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.kt similarity index 100% rename from core-network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt rename to core/network/src/benchmark/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt diff --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.kt similarity index 100% rename from core-network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt rename to core/network/src/demo/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt diff --git a/core-network/src/main/AndroidManifest.xml b/core/network/src/main/AndroidManifest.xml similarity index 100% rename from core-network/src/main/AndroidManifest.xml rename to core/network/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetworkDataSource.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/NiaNetworkDataSource.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeDataSource.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeDataSource.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkAuthor.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkAuthor.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkChangeList.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkChangeList.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkEpisode.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkEpisode.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkNewsResource.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkNewsResource.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkTopic.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/NetworkTopic.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/InstantSerializer.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/InstantSerializer.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializer.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializer.kt diff --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.kt similarity index 100% rename from core-network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt rename to core/network/src/main/java/com/google/samples/apps/nowinandroid/core/network/retrofit/RetrofitNiaNetwork.kt diff --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.kt similarity index 100% rename from core-network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt rename to core/network/src/prod/java/com/google/samples/apps/nowinandroid/core/network/di/NetworkModule.kt diff --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.kt similarity index 100% rename from core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt rename to core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt diff --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.kt similarity index 100% rename from core-network/src/test/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializerTest.kt rename to core/network/src/test/java/com/google/samples/apps/nowinandroid/core/network/model/util/NewsResourceTypeSerializerTest.kt diff --git a/core-testing/.gitignore b/core/testing/.gitignore similarity index 100% rename from core-testing/.gitignore rename to core/testing/.gitignore diff --git a/core-testing/build.gradle.kts b/core/testing/build.gradle.kts similarity index 89% rename from core-testing/build.gradle.kts rename to core/testing/build.gradle.kts index 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.xml similarity index 100% rename from core-testing/src/main/AndroidManifest.xml rename to core/testing/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.kt rename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/NiaTestRunner.kt diff --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.kt similarity index 100% rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt rename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatcherModule.kt diff --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.kt similarity index 100% rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt rename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/di/TestDispatchersModule.kt diff --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.kt similarity index 100% rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.kt rename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.kt diff --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.kt similarity index 100% rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt rename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt diff --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.kt similarity index 100% rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt rename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt diff --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.kt similarity index 100% rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt rename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestUserDataRepository.kt diff --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.kt similarity index 100% rename from core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt rename to core/testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/util/MainDispatcherRule.kt diff --git a/core-ui/.gitignore b/core/ui/.gitignore similarity index 100% rename from core-ui/.gitignore rename to core/ui/.gitignore diff --git a/core-ui/build.gradle.kts b/core/ui/build.gradle.kts similarity index 95% rename from core-ui/build.gradle.kts rename to core/ui/build.gradle.kts index 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.xml similarity index 100% rename from core-ui/src/main/AndroidManifest.xml rename to core/ui/src/main/AndroidManifest.xml diff --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.kt similarity index 100% rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.kt rename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/JankStatsExtensions.kt diff --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.kt similarity index 100% rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt rename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsFeed.kt diff --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.kt similarity index 100% rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt rename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCard.kt diff --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.kt similarity index 100% rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt rename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/NewsResourceCardList.kt diff --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.kt similarity index 100% rename from core-ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/TimeZoneBroadcastReceiver.kt rename to core/ui/src/main/java/com/google/samples/apps/nowinandroid/core/ui/TimeZoneBroadcastReceiver.kt diff --git a/core-ui/src/main/res/values/strings.xml b/core/ui/src/main/res/values/strings.xml similarity index 100% rename from core-ui/src/main/res/values/strings.xml rename to core/ui/src/main/res/values/strings.xml diff --git a/docs/ModularizationLearningJourney.md b/docs/ModularizationLearningJourney.md index 01e9b8750..56461ce73 100644 --- a/docs/ModularizationLearningJourney.md +++ b/docs/ModularizationLearningJourney.md @@ -78,14 +78,14 @@ how you can organize your project. In general, you should strive for low couplin * **High cohesion** - A module should comprise a collection of code that acts as a system. It should have clearly defined responsibilities and stay within boundaries of certain domain knowledge. For example, - the [`core-network` module](https://github.com/android/nowinandroid/tree/main/core-network) in Now + the [`core:network` module](https://github.com/android/nowinandroid/tree/main/core/network) in Now in Android is responsible for making network requests, handling responses from a remote data source, and supplying data to other modules. ## Types of modules in Now in Android -![Diagram showing types of modules and their dependencies in Now in Android](images/modularization-graph.png "Diagram showing types of modules and their dependencies in Now in Android") +![Diagram showing types of modules and their dependencies in Now in Android](images/modularization-graph.drawio.png "Diagram showing types of modules and their dependencies in Now in Android") **Top tip**: A module graph (shown above) can be useful during modularization planning for visualizing dependencies between modules. @@ -98,14 +98,14 @@ The Now in Android app contains the following types of modules: through `NiaTopLevelNavigation`. The `app` module depends on all `feature` modules and required `core` modules. -* `feature-` modules - feature specific modules which are scoped to handle a single responsibility +* `feature:` modules - feature specific modules which are scoped to handle a single responsibility in the app. These modules can be reused by any app, including test or other flavoured apps, when needed, while still keeping it separated and isolated. If a class is needed only by one `feature` module, it should remain within that module. If not, it should be extracted into an appropriate `core` module. A `feature` module should have no dependencies on other feature modules. They only depend on the `core` modules that they require. -* `core-` modules - common library modules containing auxiliary code and specific dependencies that +* `core:` modules - common library modules containing auxiliary code and specific dependencies that need to be shared between other modules in the app. These modules can depend on other core modules, but they shouldn’t depend on feature nor app modules. @@ -136,15 +136,15 @@ Using the above modularization strategy, the Now in Android app has the followin - feature-1,
- feature-2
+ feature:1,
+ feature:2
... Functionality associated with a specific feature or user journey. Typically contains UI components and ViewModels which read data from other modules.
Examples include:
AuthorScreen
@@ -152,7 +152,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-data + core:data Fetching app data from multiple sources, shared by different features. @@ -161,7 +161,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-ui + core:ui UI components, composables and resources, such as icons, used by different features. @@ -170,7 +170,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-common + core:common Common classes shared between modules. @@ -179,7 +179,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-network + core:network Making network requests and handling responses from a remote data source. @@ -187,7 +187,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-testing + core:testing Testing dependencies, repositories and util classes. @@ -196,7 +196,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-datastore + core:datastore Storing persistent data using DataStore. @@ -205,7 +205,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-database + core:database Local database storage using Room. @@ -215,7 +215,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-model + core:model Model classes used throughout the app. @@ -225,7 +225,7 @@ Using the above modularization strategy, the Now in Android app has the followin - core-navigation + core:navigation Navigation dependencies and shared navigation classes. diff --git a/docs/images/modularization-graph.drawio.png b/docs/images/modularization-graph.drawio.png new file mode 100644 index 000000000..fb5bc375b Binary files /dev/null and b/docs/images/modularization-graph.drawio.png differ diff --git a/docs/images/modularization-graph.png b/docs/images/modularization-graph.png deleted file mode 100644 index 028320e7c..000000000 Binary files a/docs/images/modularization-graph.png and /dev/null differ diff --git a/feature-author/.gitignore b/feature/author/.gitignore similarity index 100% rename from feature-author/.gitignore rename to feature/author/.gitignore diff --git a/feature-author/build.gradle.kts b/feature/author/build.gradle.kts similarity index 100% rename from feature-author/build.gradle.kts rename to feature/author/build.gradle.kts diff --git a/feature-author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt b/feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt similarity index 100% rename from feature-author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt rename to feature/author/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreenTest.kt diff --git a/feature-author/src/main/AndroidManifest.xml b/feature/author/src/main/AndroidManifest.xml similarity index 100% rename from feature-author/src/main/AndroidManifest.xml rename to feature/author/src/main/AndroidManifest.xml diff --git a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt b/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt similarity index 100% rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt rename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorScreen.kt diff --git a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt b/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt similarity index 100% rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt rename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModel.kt diff --git a/feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt b/feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt similarity index 100% rename from feature-author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt rename to feature/author/src/main/java/com/google/samples/apps/nowinandroid/feature/author/navigation/AuthorNavigation.kt diff --git a/feature-author/src/main/res/values/strings.xml b/feature/author/src/main/res/values/strings.xml similarity index 100% rename from feature-author/src/main/res/values/strings.xml rename to feature/author/src/main/res/values/strings.xml diff --git a/feature-author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt b/feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt similarity index 100% rename from feature-author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt rename to feature/author/src/test/java/com/google/samples/apps/nowinandroid/feature/author/AuthorViewModelTest.kt diff --git a/feature-bookmarks/.gitignore b/feature/bookmarks/.gitignore similarity index 100% rename from feature-bookmarks/.gitignore rename to feature/bookmarks/.gitignore diff --git a/feature-bookmarks/build.gradle.kts b/feature/bookmarks/build.gradle.kts similarity index 100% rename from feature-bookmarks/build.gradle.kts rename to feature/bookmarks/build.gradle.kts diff --git a/feature-bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt b/feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt similarity index 100% rename from feature-bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt rename to feature/bookmarks/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreenTest.kt diff --git a/feature-bookmarks/src/main/AndroidManifest.xml b/feature/bookmarks/src/main/AndroidManifest.xml similarity index 100% rename from feature-bookmarks/src/main/AndroidManifest.xml rename to feature/bookmarks/src/main/AndroidManifest.xml diff --git a/feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt similarity index 100% rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt rename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksScreen.kt diff --git a/feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt similarity index 100% rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt rename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModel.kt diff --git a/feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt b/feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt similarity index 100% rename from feature-bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt rename to feature/bookmarks/src/main/java/com/google/samples/apps/nowinandroid/feature/bookmarks/navigation/BookmarksNavigation.kt diff --git a/feature-bookmarks/src/main/res/values/strings.xml b/feature/bookmarks/src/main/res/values/strings.xml similarity index 100% rename from feature-bookmarks/src/main/res/values/strings.xml rename to feature/bookmarks/src/main/res/values/strings.xml diff --git a/feature-bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt b/feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt similarity index 100% rename from feature-bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt rename to feature/bookmarks/src/test/java/com/google/samples/apps/nowinandroid/feature/bookmarks/BookmarksViewModelTest.kt diff --git a/feature-foryou/.gitignore b/feature/foryou/.gitignore similarity index 100% rename from feature-foryou/.gitignore rename to feature/foryou/.gitignore diff --git a/feature-foryou/build.gradle.kts b/feature/foryou/build.gradle.kts similarity index 100% rename from feature-foryou/build.gradle.kts rename to feature/foryou/build.gradle.kts diff --git a/feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt b/feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt similarity index 100% rename from feature-foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt rename to feature/foryou/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreenTest.kt diff --git a/feature-foryou/src/main/AndroidManifest.xml b/feature/foryou/src/main/AndroidManifest.xml similarity index 100% rename from feature-foryou/src/main/AndroidManifest.xml rename to feature/foryou/src/main/AndroidManifest.xml diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/AuthorsCarousel.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/FollowedInterestsUiState.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouInterestsSelectionUiState.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouScreen.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt diff --git a/feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt b/feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt similarity index 100% rename from feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt rename to feature/foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/navigation/ForYouNavigation.kt diff --git a/feature-foryou/src/main/res/drawable/ic_icon_placeholder.xml b/feature/foryou/src/main/res/drawable/ic_icon_placeholder.xml similarity index 100% rename from feature-foryou/src/main/res/drawable/ic_icon_placeholder.xml rename to feature/foryou/src/main/res/drawable/ic_icon_placeholder.xml diff --git a/feature-foryou/src/main/res/values/strings.xml b/feature/foryou/src/main/res/values/strings.xml similarity index 100% rename from feature-foryou/src/main/res/values/strings.xml rename to feature/foryou/src/main/res/values/strings.xml diff --git a/feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt b/feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt similarity index 100% rename from feature-foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt rename to feature/foryou/src/test/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModelTest.kt diff --git a/feature-interests/.gitignore b/feature/interests/.gitignore similarity index 100% rename from feature-interests/.gitignore rename to feature/interests/.gitignore diff --git a/feature-interests/build.gradle.kts b/feature/interests/build.gradle.kts similarity index 100% rename from feature-interests/build.gradle.kts rename to feature/interests/build.gradle.kts diff --git a/feature-interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt b/feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt similarity index 100% rename from feature-interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt rename to feature/interests/src/androidTest/java/com/google/samples/apps/nowinandroid/interests/InterestsScreenTest.kt diff --git a/feature-interests/src/main/AndroidManifest.xml b/feature/interests/src/main/AndroidManifest.xml similarity index 100% rename from feature-interests/src/main/AndroidManifest.xml rename to feature/interests/src/main/AndroidManifest.xml diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsItem.kt diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsScreen.kt diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/InterestsViewModel.kt diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/TabContent.kt diff --git a/feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt b/feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt similarity index 100% rename from feature-interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt rename to feature/interests/src/main/java/com/google/samples/apps/nowinandroid/feature/interests/navigation/InterestsNavigation.kt diff --git a/feature-interests/src/main/res/values/strings.xml b/feature/interests/src/main/res/values/strings.xml similarity index 100% rename from feature-interests/src/main/res/values/strings.xml rename to feature/interests/src/main/res/values/strings.xml diff --git a/feature-interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt b/feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt similarity index 100% rename from feature-interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt rename to feature/interests/src/test/java/com/google/samples/apps/nowinandroid/interests/InterestsViewModelTest.kt diff --git a/feature-topic/.gitignore b/feature/topic/.gitignore similarity index 100% rename from feature-topic/.gitignore rename to feature/topic/.gitignore diff --git a/feature-topic/build.gradle.kts b/feature/topic/build.gradle.kts similarity index 100% rename from feature-topic/build.gradle.kts rename to feature/topic/build.gradle.kts diff --git a/feature-topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt b/feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt similarity index 100% rename from feature-topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt rename to feature/topic/src/androidTest/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreenTest.kt diff --git a/feature-topic/src/main/AndroidManifest.xml b/feature/topic/src/main/AndroidManifest.xml similarity index 100% rename from feature-topic/src/main/AndroidManifest.xml rename to feature/topic/src/main/AndroidManifest.xml diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt similarity index 100% rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt rename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicScreen.kt diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt similarity index 100% rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt rename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt diff --git a/feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt b/feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt similarity index 100% rename from feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt rename to feature/topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/navigation/TopicNavigation.kt diff --git a/feature-topic/src/main/res/values/strings.xml b/feature/topic/src/main/res/values/strings.xml similarity index 100% rename from feature-topic/src/main/res/values/strings.xml rename to feature/topic/src/main/res/values/strings.xml diff --git a/feature-topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt b/feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt similarity index 100% rename from feature-topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt rename to feature/topic/src/test/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModelTest.kt diff --git a/settings.gradle.kts b/settings.gradle.kts index 3393b4879..69a374739 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -43,22 +43,22 @@ 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(":feature-author") -include(":feature-foryou") -include(":feature-interests") -include(":feature-bookmarks") -include(":feature-topic") +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") +include(":feature:bookmarks") +include(":feature:topic") include(":lint") include(":sync") diff --git a/sync/build.gradle.kts b/sync/build.gradle.kts index 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)