A fully functional Android app built entirely with Kotlin and Jetpack Compose
Add Application-wide `CoroutineScope` in the DI graph
Simon Marquisaa701064a278
diff --git a/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/CoroutineScopesModule.kt b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/CoroutineScopesModule.ktnew file mode 100644index 000000000..bc44e394d--- /dev/null+++ b/core/common/src/main/java/com/google/samples/apps/nowinandroid/core/network/di/CoroutineScopesModule.kt@@ -0,0 +1,39 @@+/*+ * Copyright 2023 The Android Open Source Project+ *+ * Licensed under the Apache License, Version 2.0 (the "License");+ * you may not use this file except in compliance with the License.+ * You may obtain a copy of the License at+ *+ * https://www.apache.org/licenses/LICENSE-2.0+ *+ * Unless required by applicable law or agreed to in writing, software+ * distributed under the License is distributed on an "AS IS" BASIS,+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.+ * See the License for the specific language governing permissions and+ * limitations under the License.+ */++package com.google.samples.apps.nowinandroid.core.network.di++import com.google.samples.apps.nowinandroid.core.network.Dispatcher+import com.google.samples.apps.nowinandroid.core.network.NiaDispatchers.IO+import dagger.Module+import dagger.Provides+import dagger.hilt.InstallIn+import dagger.hilt.components.SingletonComponent+import kotlinx.coroutines.CoroutineDispatcher+import kotlinx.coroutines.CoroutineScope+import kotlinx.coroutines.SupervisorJob+import javax.inject.Singleton++@Module+@InstallIn(SingletonComponent::class)+object CoroutineScopesModule {+ @Provides+ @Singleton+ @Dispatcher(IO)+ fun providesIOCoroutineScope(+ @Dispatcher(IO) ioDispatcher: CoroutineDispatcher,+ ): CoroutineScope = CoroutineScope(SupervisorJob() + ioDispatcher)+}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.ktindex fad7ac382..cb7e38db7 100644--- 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@@ -27,9 +27,7 @@ import dagger.Moduleimport dagger.Providesimport dagger.hilt.components.SingletonComponentimport dagger.hilt.testing.TestInstallIn-import kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.CoroutineScope-import kotlinx.coroutines.SupervisorJobimport org.junit.rules.TemporaryFolderimport javax.inject.Singleton@@ -43,13 +41,12 @@ object TestDataStoreModule {@Provides@Singletonfun providesUserPreferencesDataStore(- @Dispatcher(IO) ioDispatcher: CoroutineDispatcher,+ @Dispatcher(IO) ioScope: CoroutineScope,userPreferencesSerializer: UserPreferencesSerializer,tmpFolder: TemporaryFolder,): DataStore<UserPreferences> =tmpFolder.testUserPreferencesDataStore(- // TODO: Provide an application-wide CoroutineScope in the DI graph- coroutineScope = CoroutineScope(SupervisorJob() + ioDispatcher),+ coroutineScope = ioScope,userPreferencesSerializer = userPreferencesSerializer,)}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.ktindex 895e22307..89a6eb734 100644--- 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@@ -30,9 +30,7 @@ import dagger.Providesimport dagger.hilt.InstallInimport dagger.hilt.android.qualifiers.ApplicationContextimport dagger.hilt.components.SingletonComponent-import kotlinx.coroutines.CoroutineDispatcherimport kotlinx.coroutines.CoroutineScope-import kotlinx.coroutines.SupervisorJobimport javax.inject.Singleton@Module@@ -43,12 +41,12 @@ object DataStoreModule {@Singletonfun providesUserPreferencesDataStore(@ApplicationContext context: Context,- @Dispatcher(IO) ioDispatcher: CoroutineDispatcher,+ @Dispatcher(IO) ioScope: CoroutineScope,userPreferencesSerializer: UserPreferencesSerializer,): DataStore<UserPreferences> =DataStoreFactory.create(serializer = userPreferencesSerializer,- scope = CoroutineScope(ioDispatcher + SupervisorJob()),+ scope = ioScope,migrations = listOf(IntToStringIdsMigration,),