Rename core-domain to core-data

Change-Id: Ief2eef982c9ebe4be729bee1d2f59e2ab8b1f911

app/build.gradle.kts

@@ -71,7 +71,7 @@ dependencies {
 
     androidTestImplementation(project(":core-testing"))
     androidTestImplementation(project(":core-datastore-test"))
-    androidTestImplementation(project(":core-domain-test"))
+    androidTestImplementation(project(":core-data-test"))
     androidTestImplementation(project(":core-network"))
 
     implementation(libs.androidx.activity.compose)

core-data-test/build.gradle.kts

@@ -21,7 +21,7 @@ plugins {
 }
 
 dependencies {
-    api(project(":core-domain"))
+    api(project(":core-data"))
     implementation(project(":core-testing"))
 
     implementation(libs.hilt.android)

core-data-test/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.domain.test">
+    package="com.google.samples.apps.nowinandroid.core.data.test">
 
 </manifest>

core-data-test/src/main/java/com/google/samples/apps/nowinandroid/core/data/test/TestDataModule.kt

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.test
+package com.google.samples.apps.nowinandroid.core.data.test
 
-import com.google.samples.apps.nowinandroid.core.domain.di.DomainModule
+import com.google.samples.apps.nowinandroid.core.data.di.DataModule
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.fake.FakeAuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.fake.FakeAuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.fake.FakeNewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.fake.FakeNewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.fake.FakeTopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.fake.FakeTopicsRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.components.SingletonComponent
@@ -31,9 +31,9 @@ import dagger.hilt.testing.TestInstallIn
 @Module
 @TestInstallIn(
     components = [SingletonComponent::class],
-    replaces = [DomainModule::class]
+    replaces = [DataModule::class]
 )
-interface TestDomainModule {
+interface TestDataModule {
     @Binds
     fun bindsTopicRepository(
         fakeTopicsRepository: FakeTopicsRepository

core-data/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.google.samples.apps.nowinandroid.core.domain">
+    package="com.google.samples.apps.nowinandroid.core.data">
 
 </manifest>

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/SyncUtilities.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain
+package com.google.samples.apps.nowinandroid.core.data
 
 import android.util.Log
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/di/DataModule.kt

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.di
+package com.google.samples.apps.nowinandroid.core.data.di
 
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.LocalAuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.LocalAuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.LocalNewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.LocalNewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.LocalTopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.LocalTopicsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -29,7 +29,7 @@ import dagger.hilt.components.SingletonComponent
 
 @Module
 @InstallIn(SingletonComponent::class)
-interface DomainModule {
+interface DataModule {
 
     @Binds
     fun bindsTopicRepository(

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Author.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Episode.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntity
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkEpisode

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/NewsResource.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntity

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/model/Topic.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/AuthorsRepository.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Syncable
+import com.google.samples.apps.nowinandroid.core.data.Syncable
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import kotlinx.coroutines.flow.Flow
 

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalAuthorsRepository.kt

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.changeListSync
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
 import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDao
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.changeListSync
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.network.NiANetwork
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalNewsRepository.kt

@@ -14,8 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.changeListSync
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.model.authorCrossReferences
+import com.google.samples.apps.nowinandroid.core.data.model.authorEntityShells
+import com.google.samples.apps.nowinandroid.core.data.model.episodeEntityShell
+import com.google.samples.apps.nowinandroid.core.data.model.topicCrossReferences
+import com.google.samples.apps.nowinandroid.core.data.model.topicEntityShells
 import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDao
 import com.google.samples.apps.nowinandroid.core.database.dao.EpisodeDao
 import com.google.samples.apps.nowinandroid.core.database.dao.NewsResourceDao
@@ -26,14 +34,6 @@ import com.google.samples.apps.nowinandroid.core.database.model.PopulatedNewsRes
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.changeListSync
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.model.authorCrossReferences
-import com.google.samples.apps.nowinandroid.core.domain.model.authorEntityShells
-import com.google.samples.apps.nowinandroid.core.domain.model.episodeEntityShell
-import com.google.samples.apps.nowinandroid.core.domain.model.topicCrossReferences
-import com.google.samples.apps.nowinandroid.core.domain.model.topicEntityShells
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.network.NiANetwork
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalTopicsRepository.kt

@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.changeListSync
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
 import com.google.samples.apps.nowinandroid.core.database.dao.TopicDao
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.changeListSync
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.network.NiANetwork
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/NewsRepository.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Syncable
+import com.google.samples.apps.nowinandroid.core.data.Syncable
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import kotlinx.coroutines.flow.Flow
 

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/TopicsRepository.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Syncable
+import com.google.samples.apps.nowinandroid.core.data.Syncable
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import kotlinx.coroutines.flow.Flow
 

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeAuthorsRepository.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository.fake
+package com.google.samples.apps.nowinandroid.core.data.repository.fake
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeNewsRepository.kt

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository.fake
+package com.google.samples.apps.nowinandroid.core.data.repository.fake
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO

core-data/src/main/java/com/google/samples/apps/nowinandroid/core/data/repository/fake/FakeTopicsRepository.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository.fake
+package com.google.samples.apps.nowinandroid.core.data.repository.fake
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/model/NetworkEntityKtTest.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.model
+package com.google.samples.apps.nowinandroid.core.data.model
 
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResourceType.Article
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/FakeNewsRepositoryTest.kt

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.repository.fake.FakeNewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.fake.FakeNewsRepository
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.serialization.json.Json
 import org.junit.Before

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalAuthorsRepositoryTest.kt

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.CollectionType
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestAuthorDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNiaNetwork
 import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDao
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
 import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.CollectionType
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestAuthorDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestNiaNetwork
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkAuthor
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalNewsRepositoryTest.kt

@@ -14,8 +14,23 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
-
+
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.model.authorCrossReferences
+import com.google.samples.apps.nowinandroid.core.data.model.authorEntityShells
+import com.google.samples.apps.nowinandroid.core.data.model.episodeEntityShell
+import com.google.samples.apps.nowinandroid.core.data.model.topicCrossReferences
+import com.google.samples.apps.nowinandroid.core.data.model.topicEntityShells
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.CollectionType
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestAuthorDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestEpisodeDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNewsResourceDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNiaNetwork
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestTopicDao
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.filteredInterestsIds
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.nonPresentInterestsIds
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity
 import com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntity
 import com.google.samples.apps.nowinandroid.core.database.model.NewsResourceEntity
@@ -25,21 +40,6 @@ import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
 import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.model.authorCrossReferences
-import com.google.samples.apps.nowinandroid.core.domain.model.authorEntityShells
-import com.google.samples.apps.nowinandroid.core.domain.model.episodeEntityShell
-import com.google.samples.apps.nowinandroid.core.domain.model.topicCrossReferences
-import com.google.samples.apps.nowinandroid.core.domain.model.topicEntityShells
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.CollectionType
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestAuthorDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestEpisodeDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestNewsResourceDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestNiaNetwork
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestTopicDao
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.filteredInterestsIds
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.nonPresentInterestsIds
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkChangeList
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/LocalTopicsRepositoryTest.kt

@@ -14,18 +14,18 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.model.asEntity
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.CollectionType
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestNiaNetwork
+import com.google.samples.apps.nowinandroid.core.data.testdoubles.TestTopicDao
 import com.google.samples.apps.nowinandroid.core.database.dao.TopicDao
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity
 import com.google.samples.apps.nowinandroid.core.database.model.asExternalModel
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
 import com.google.samples.apps.nowinandroid.core.datastore.test.testUserPreferencesDataStore
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.model.asEntity
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.CollectionType
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestNiaNetwork
-import com.google.samples.apps.nowinandroid.core.domain.testdoubles.TestTopicDao
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic
 import kotlinx.coroutines.flow.first

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/repository/TestSynchronizer.kt

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.repository
+package com.google.samples.apps.nowinandroid.core.data.repository
 
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
 
 /**
  * Test synchronizer that delegates to [NiaPreferences]

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestAuthorDao.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.database.dao.AuthorDao
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestEpisodeDao.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.database.dao.EpisodeDao
 import com.google.samples.apps.nowinandroid.core.database.model.EpisodeEntity

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNewsResourceDao.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.database.dao.NewsResourceDao
 import com.google.samples.apps.nowinandroid.core.database.model.AuthorEntity

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestNiaNetwork.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.network.NiANetwork
 import com.google.samples.apps.nowinandroid.core.network.fake.FakeDataSource

core-data/src/test/java/com/google/samples/apps/nowinandroid/core/data/testdoubles/TestTopicDao.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.google.samples.apps.nowinandroid.core.domain.testdoubles
+package com.google.samples.apps.nowinandroid.core.data.testdoubles
 
 import com.google.samples.apps.nowinandroid.core.database.dao.TopicDao
 import com.google.samples.apps.nowinandroid.core.database.model.TopicEntity

core-testing/build.gradle.kts

@@ -21,7 +21,7 @@ plugins {
 
 dependencies {
     implementation(project(":core-common"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
     implementation(project(":core-model"))
 
     implementation(libs.hilt.android)

core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestAuthorsRepository.kt

@@ -16,8 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.core.testing.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow

core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestNewsRepository.kt

@@ -16,8 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.core.testing.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Author
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.Topic

core-testing/src/main/java/com/google/samples/apps/nowinandroid/core/testing/repository/TestTopicsRepository.kt

@@ -16,8 +16,8 @@
 
 package com.google.samples.apps.nowinandroid.core.testing.repository
 
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.Topic
 import kotlinx.coroutines.channels.BufferOverflow
 import kotlinx.coroutines.flow.Flow

feature-following/build.gradle.kts

@@ -31,7 +31,7 @@ android {
 dependencies {
     implementation(project(":core-model"))
     implementation(project(":core-ui"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
 
     testImplementation(project(":core-testing"))
     androidTestImplementation(project(":core-testing"))

feature-following/src/main/java/com/google/samples/apps/nowinandroid/feature/following/FollowingViewModel.kt

@@ -18,8 +18,8 @@ package com.google.samples.apps.nowinandroid.feature.following
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import dagger.hilt.android.lifecycle.HiltViewModel

feature-foryou/build.gradle.kts

@@ -32,7 +32,7 @@ android {
 dependencies {
     implementation(project(":core-model"))
     implementation(project(":core-ui"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
 
     testImplementation(project(":core-testing"))
     androidTestImplementation(project(":core-testing"))

feature-foryou/src/main/java/com/google/samples/apps/nowinandroid/feature/foryou/ForYouViewModel.kt

@@ -24,9 +24,9 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import androidx.lifecycle.viewmodel.compose.SavedStateHandleSaveableApi
 import androidx.lifecycle.viewmodel.compose.saveable
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableAuthor
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource

feature-topic/build.gradle.kts

@@ -31,7 +31,7 @@ android {
 dependencies {
     implementation(project(":core-model"))
     implementation(project(":core-ui"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
     implementation(project(":core-common"))
 
     testImplementation(project(":core-testing"))

feature-topic/src/main/java/com/google/samples/apps/nowinandroid/feature/topic/TopicViewModel.kt

@@ -19,8 +19,8 @@ package com.google.samples.apps.nowinandroid.feature.topic
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.model.data.FollowableTopic
 import com.google.samples.apps.nowinandroid.core.model.data.NewsResource
 import com.google.samples.apps.nowinandroid.core.model.data.Topic

settings.gradle.kts

@@ -44,8 +44,8 @@ include(":app")
 include(":app-nia-catalog")
 include(":benchmark")
 include(":core-common")
-include(":core-domain")
+include(":core-data")
-include(":core-domain-test")
+include(":core-data-test")
 include(":core-database")
 include(":core-datastore")
 include(":core-datastore-test")

sync/build.gradle.kts

@@ -30,7 +30,7 @@ android {
 dependencies {
     implementation(project(":core-common"))
     implementation(project(":core-model"))
-    implementation(project(":core-domain"))
+    implementation(project(":core-data"))
     implementation(project(":core-datastore"))
 
     implementation(libs.kotlinx.coroutines.android)

sync/src/main/java/com/google/samples/apps/nowinandroid/sync/workers/SyncWorker.kt

@@ -23,12 +23,12 @@ import androidx.work.ForegroundInfo
 import androidx.work.OneTimeWorkRequestBuilder
 import androidx.work.OutOfQuotaPolicy
 import androidx.work.WorkerParameters
+import com.google.samples.apps.nowinandroid.core.data.Synchronizer
+import com.google.samples.apps.nowinandroid.core.data.repository.AuthorsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.NewsRepository
+import com.google.samples.apps.nowinandroid.core.data.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.datastore.ChangeListVersions
 import com.google.samples.apps.nowinandroid.core.datastore.NiaPreferences
-import com.google.samples.apps.nowinandroid.core.domain.Synchronizer
-import com.google.samples.apps.nowinandroid.core.domain.repository.AuthorsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.NewsRepository
-import com.google.samples.apps.nowinandroid.core.domain.repository.TopicsRepository
 import com.google.samples.apps.nowinandroid.core.network.Dispatcher
 import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO
 import com.google.samples.apps.nowinandroid.sync.initializers.SyncConstraints