From 197d98b21446b34db2dc89fb223b569d63e70d86 Mon Sep 17 00:00:00 2001 From: lihenggui Date: Mon, 25 Mar 2024 15:29:48 -0700 Subject: [PATCH] Fix compilation errors --- .../DemoNiaNetworkDataSource.kt} | 15 +-------------- .../core/network/di/FlavoredNetworkModule.kt | 6 +----- .../FakeNiaNetworkDataSourceTest.kt | 8 -------- 3 files changed, 2 insertions(+), 27 deletions(-) rename core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/{fake/FakeNiaNetworkDataSource.kt => demo/DemoNiaNetworkDataSource.kt} (73%) rename core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/{fake => demo}/FakeNiaNetworkDataSourceTest.kt (84%) diff --git a/core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt b/core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt similarity index 73% rename from core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt rename to core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt index 55cbf81a9..78a71a68a 100644 --- a/core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt +++ b/core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt @@ -16,13 +16,7 @@ package com.google.samples.apps.nowinandroid.core.network.demo -<<<<<<<< HEAD:core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt import com.google.samples.apps.nowinandroid.core.di.IODispatcher -======== -import JvmUnitTestDemoAssetManager -import com.google.samples.apps.nowinandroid.core.network.Dispatcher -import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO ->>>>>>>> upstream/main:core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource import com.google.samples.apps.nowinandroid.core.network.assets.NEWS_DATA import com.google.samples.apps.nowinandroid.core.network.assets.TOPICS_DATA @@ -36,16 +30,9 @@ import me.tatarka.inject.annotations.Inject /** * [NiaNetworkDataSource] implementation that provides static news resources to aid development */ -<<<<<<<< HEAD:core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSource.kt -class FakeNiaNetworkDataSource @Inject constructor( - private val ioDispatcher: IODispatcher, - private val networkJson: Json, -======== class DemoNiaNetworkDataSource @Inject constructor( - @Dispatcher(IO) private val ioDispatcher: CoroutineDispatcher, + private val ioDispatcher: IODispatcher, private val networkJson: Json, - private val assets: DemoAssetManager = JvmUnitTestDemoAssetManager, ->>>>>>>> upstream/main:core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSource.kt ) : NiaNetworkDataSource { override suspend fun getTopics(ids: List?): List = diff --git a/core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.kt b/core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.kt index 2d551edaf..07cc87ca3 100644 --- a/core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.kt +++ b/core/network/src/commonMain/kotlin/com/google/samples/apps/nowinandroid/core/network/di/FlavoredNetworkModule.kt @@ -17,11 +17,7 @@ package com.google.samples.apps.nowinandroid.core.network.di import com.google.samples.apps.nowinandroid.core.network.NiaNetworkDataSource -import com.google.samples.apps.nowinandroid.core.network.fake.FakeNiaNetworkDataSource -import dagger.Binds -import dagger.Module -import dagger.hilt.InstallIn -import dagger.hilt.components.SingletonComponent +import com.google.samples.apps.nowinandroid.core.network.demo.DemoNiaNetworkDataSource internal interface FlavoredNetworkModule { diff --git a/core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt b/core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/FakeNiaNetworkDataSourceTest.kt similarity index 84% rename from core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt rename to core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/FakeNiaNetworkDataSourceTest.kt index ca2f9d272..e7fda79db 100644 --- a/core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt +++ b/core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/FakeNiaNetworkDataSourceTest.kt @@ -16,10 +16,6 @@ package com.google.samples.apps.nowinandroid.core.network.demo -<<<<<<<< HEAD:core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt -======== -import JvmUnitTestDemoAssetManager ->>>>>>>> upstream/main:core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSourceTest.kt import com.google.samples.apps.nowinandroid.core.network.model.NetworkNewsResource import com.google.samples.apps.nowinandroid.core.network.model.NetworkTopic import kotlinx.coroutines.test.StandardTestDispatcher @@ -43,10 +39,6 @@ class DemoNiaNetworkDataSourceTest { subject = DemoNiaNetworkDataSource( ioDispatcher = testDispatcher, networkJson = Json { ignoreUnknownKeys = true }, -<<<<<<<< HEAD:core/network/src/commonTest/kotlin/com/google/samples/apps/nowinandroid/core/network/fake/FakeNiaNetworkDataSourceTest.kt -======== - assets = JvmUnitTestDemoAssetManager, ->>>>>>>> upstream/main:core/network/src/test/kotlin/com/google/samples/apps/nowinandroid/core/network/demo/DemoNiaNetworkDataSourceTest.kt ) }