From c2c81d37474041d41cc848ccf4f99f510ca34dd6 Mon Sep 17 00:00:00 2001 From: ganfra Date: Tue, 11 Jul 2023 11:40:55 +0200 Subject: [PATCH] Coroutine: remove diffUpdateDispatcher, not used anymore --- app/src/main/kotlin/io/element/android/x/di/AppModule.kt | 3 --- .../android/libraries/core/coroutine/CoroutineDispatchers.kt | 1 - .../kotlin/io/element/android/samples/minimal/Singleton.kt | 3 --- .../android/tests/testutils/TestCoroutineDispatchers.kt | 2 -- 4 files changed, 9 deletions(-) diff --git a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt index 89ab50d32a..a1d0b50522 100644 --- a/app/src/main/kotlin/io/element/android/x/di/AppModule.kt +++ b/app/src/main/kotlin/io/element/android/x/di/AppModule.kt @@ -37,10 +37,8 @@ import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.MainScope -import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.plus import java.io.File -import java.util.concurrent.Executors @Module @ContributesTo(AppScope::class) @@ -99,7 +97,6 @@ object AppModule { io = Dispatchers.IO, computation = Dispatchers.Default, main = Dispatchers.Main, - diffUpdateDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher() ) } diff --git a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt index a3f1586070..918b6cda8a 100644 --- a/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt +++ b/libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt @@ -22,5 +22,4 @@ data class CoroutineDispatchers( val io: CoroutineDispatcher, val computation: CoroutineDispatcher, val main: CoroutineDispatcher, - val diffUpdateDispatcher: CoroutineDispatcher, ) diff --git a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt index 006ca8d9e4..5f8c6555a5 100644 --- a/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt +++ b/samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt @@ -22,10 +22,8 @@ import io.element.android.libraries.matrix.api.tracing.TracingConfigurations import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.MainScope -import kotlinx.coroutines.asCoroutineDispatcher import kotlinx.coroutines.plus import timber.log.Timber -import java.util.concurrent.Executors object Singleton { @@ -39,6 +37,5 @@ object Singleton { io = Dispatchers.IO, computation = Dispatchers.Default, main = Dispatchers.Main, - diffUpdateDispatcher = Executors.newSingleThreadExecutor().asCoroutineDispatcher(), ) } diff --git a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestCoroutineDispatchers.kt b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestCoroutineDispatchers.kt index b8376ddf6f..1fdb5879fc 100644 --- a/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestCoroutineDispatchers.kt +++ b/tests/testutils/src/main/kotlin/io/element/android/tests/testutils/TestCoroutineDispatchers.kt @@ -37,12 +37,10 @@ fun TestScope.testCoroutineDispatchers( io = UnconfinedTestDispatcher(testScheduler), computation = UnconfinedTestDispatcher(testScheduler), main = UnconfinedTestDispatcher(testScheduler), - diffUpdateDispatcher = UnconfinedTestDispatcher(testScheduler), ) false -> CoroutineDispatchers( io = StandardTestDispatcher(testScheduler), computation = StandardTestDispatcher(testScheduler), main = StandardTestDispatcher(testScheduler), - diffUpdateDispatcher = StandardTestDispatcher(testScheduler), ) }