Remove no longer necessary suspend modifier from DeviceProvider#initi…

…alize()
badoo · Dec 30, 2024 · 306d790 · 306d790
1 parent 2f9c3d2
commit 306d790
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/core/src/main/kotlin/com/malinskiy/marathon/device/DeviceProvider.kt b/core/src/main/kotlin/com/malinskiy/marathon/device/DeviceProvider.kt
@@ -3,9 +3,9 @@ package com.malinskiy.marathon.device
 import kotlinx.coroutines.flow.Flow
 
 interface DeviceProvider : AutoCloseable {
+    val deviceEvents: Flow<DeviceEvent>
     val deviceInitializationTimeoutMillis: Long
-    suspend fun initialize()
-    suspend fun terminate()
 
-    val deviceEvents: Flow<DeviceEvent>
+    fun initialize()
+    suspend fun terminate()
 }
diff --git a/core/src/main/kotlin/com/malinskiy/marathon/execution/Scheduler.kt b/core/src/main/kotlin/com/malinskiy/marathon/execution/Scheduler.kt
@@ -132,7 +132,7 @@ class Scheduler(
         }
     }
 
-    private suspend fun initializeDeviceProvider(scope: CoroutineScope) {
+    private fun initializeDeviceProvider(scope: CoroutineScope) {
         logger.debug("Initializing device provider")
         deviceProvider.initialize()
 

diff --git a/...roid/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/ddmlib/DdmlibDeviceProvider.kt b/...roid/ddmlib/src/main/kotlin/com/malinskiy/marathon/android/ddmlib/DdmlibDeviceProvider.kt
@@ -55,12 +55,12 @@ class DdmlibDeviceProvider(
     private val job = SupervisorJob()
     private val coroutineScope = CoroutineScope(job + dispatcher)
 
-    override val deviceInitializationTimeoutMillis: Long = 180_000
-
     override val deviceEvents: Flow<DeviceEvent>
         get() = channel.consumeAsFlow()
 
-    override suspend fun initialize() {
+    override val deviceInitializationTimeoutMillis: Long = 180_000
+
+    override fun initialize() {
         DdmPreferences.setTimeOut(DEFAULT_DDM_LIB_TIMEOUT)
         @Suppress("DEPRECATION")
         AndroidDebugBridge.initIfNeeded(false)

diff --git a/vendor/vendor-test/src/main/kotlin/com/malinskiy/marathon/test/StubDeviceProvider.kt b/vendor/vendor-test/src/main/kotlin/com/malinskiy/marathon/test/StubDeviceProvider.kt
@@ -15,9 +15,6 @@ class StubDeviceProvider : DeviceProvider {
     private val channel: Channel<DeviceEvent> = unboundedChannel()
     var providingLogic: (suspend (Channel<DeviceEvent>) -> Unit)? = null
 
-    override val deviceInitializationTimeoutMillis: Long = 180_000
-    override suspend fun initialize() = Unit
-
     override val deviceEvents: Flow<DeviceEvent>
         get() {
             providingLogic?.let {
@@ -29,6 +26,10 @@ class StubDeviceProvider : DeviceProvider {
             return channel.consumeAsFlow()
         }
 
+    override val deviceInitializationTimeoutMillis: Long = 180_000
+
+    override fun initialize() = Unit
+
     override suspend fun terminate() {
         channel.close()
     }