Updated Kotlin to 1.6.10 and coroutines to 1.6.0

badoo · Feb 10, 2022 · fca5b24 · fca5b24
1 parent c447e47
commit fca5b24
Show file tree

Hide file tree

Showing 4 changed files with 2,922 additions and 5 deletions.
diff --git a/...es-interop/src/commonMain/kotlin/com/badoo/reaktive/coroutinesinterop/ObservableAsFlow.kt b/...es-interop/src/commonMain/kotlin/com/badoo/reaktive/coroutinesinterop/ObservableAsFlow.kt
@@ -6,8 +6,10 @@ import com.badoo.reaktive.observable.Observable
 import com.badoo.reaktive.observable.ObservableObserver
 import com.badoo.reaktive.utils.ensureNeverFrozen
 import kotlinx.coroutines.ExperimentalCoroutinesApi
+import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.buffer
 import kotlinx.coroutines.flow.channelFlow
 
 @ExperimentalCoroutinesApi
@@ -24,7 +26,7 @@ fun <T> Observable<T>.asFlow(): Flow<T> =
                 }
 
                 override fun onNext(value: T) {
-                    channel.offer(value)
+                    channel.trySend(value)
                 }
 
                 override fun onComplete() {
@@ -43,4 +45,4 @@ fun <T> Observable<T>.asFlow(): Flow<T> =
         }
 
         awaitClose(serialDisposable::dispose)
-    }
+    }.buffer(capacity = Channel.UNLIMITED)
diff --git a/.../jvmJsCommonMain/kotlin/com/badoo/reaktive/coroutinesinterop/CoroutineContextScheduler.kt b/.../jvmJsCommonMain/kotlin/com/badoo/reaktive/coroutinesinterop/CoroutineContextScheduler.kt
@@ -85,7 +85,7 @@ internal class CoroutineContextScheduler(
 
         override fun submitRepeating(startDelayMillis: Long, periodMillis: Long, task: () -> Unit) {
             channelRef.value?.channel?.apply {
-                offer(
+                trySend(
                     Task(
                         startAtMillis = clock.uptimeMillis + startDelayMillis,
                         periodMillis = periodMillis,

diff --git a/includedBuild/dependencies/src/main/kotlin/com/badoo/reaktive/dependencies/Deps.kt b/includedBuild/dependencies/src/main/kotlin/com/badoo/reaktive/dependencies/Deps.kt
@@ -2,8 +2,8 @@ package com.badoo.reaktive.dependencies
 
 object Deps {
 
-    private const val kotlinVersion = "1.6.0"
-    private const val coroutinesVersion = "1.5.2"
+    private const val kotlinVersion = "1.6.10"
+    private const val coroutinesVersion = "1.6.0"
     private const val detektVersion = "1.9.1"
 
     val kotlin = Kotlin