Update kotlinx-coroutines to 1.6.0

Closes #69
michaelbull · Jan 8, 2022 · 72df4c0 · 72df4c0
1 parent b3f1edc
commit 72df4c0
Show file tree

Hide file tree

Showing 10 changed files with 181 additions and 270 deletions.
diff --git a/buildSrc/src/main/kotlin/Versions.kt b/buildSrc/src/main/kotlin/Versions.kt
@@ -2,8 +2,7 @@ object Versions {
     const val dokka = "1.6.10"
     const val kotlin = "1.6.10"
     const val kotlinBenchmark = "0.4.1"
-    const val kotlinCoroutines = "1.5.2"
-    const val kotlinCoroutinesTest = "1.5.2"
+    const val kotlinCoroutines = "1.6.0"
     const val ktor = "2.0.0-beta-1"
     const val logback = "1.2.3"
     const val versionsPlugin = "0.41.0"

diff --git a/kotlin-result-coroutines/build.gradle.kts b/kotlin-result-coroutines/build.gradle.kts
@@ -24,14 +24,14 @@ kotlin {
             dependencies {
                 implementation(kotlin("test-common"))
                 implementation(kotlin("test-annotations-common"))
+                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinCoroutines}")
             }
         }
 
         val jvmTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation(kotlin("test"))
-                implementation("org.jetbrains.kotlinx:kotlinx-coroutines-test:${Versions.kotlinCoroutinesTest}")
             }
         }
 
@@ -40,30 +40,6 @@ kotlin {
                 implementation(kotlin("test-js"))
             }
         }
-
-        val nativeTest by creating {
-            dependsOn(commonTest)
-        }
-
-        val linuxX64Test by getting {
-            dependsOn(nativeTest)
-        }
-
-        val mingwX64Test by getting {
-            dependsOn(nativeTest)
-        }
-
-        val macosX64Test by getting {
-            dependsOn(nativeTest)
-        }
-
-        val iosX64Test by getting {
-            dependsOn(nativeTest)
-        }
-
-        val iosArm64Test by getting {
-            dependsOn(nativeTest)
-        }
     }
 }
 

diff --git a/...outines/src/commonTest/kotlin/com.github.michaelbull.result.coroutines/RunBlockingTest.kt b/...outines/src/commonTest/kotlin/com.github.michaelbull.result.coroutines/RunBlockingTest.kt
diff --git a/...monTest/kotlin/com.github.michaelbull.result.coroutines/binding/SuspendableBindingTest.kt b/...monTest/kotlin/com.github.michaelbull.result.coroutines/binding/SuspendableBindingTest.kt
@@ -3,19 +3,21 @@ package com.github.michaelbull.result.coroutines.binding
 import com.github.michaelbull.result.Err
 import com.github.michaelbull.result.Ok
 import com.github.michaelbull.result.Result
-import com.github.michaelbull.result.coroutines.runBlockingTest
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.delay
+import kotlinx.coroutines.test.runTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
 import kotlin.test.assertFalse
 import kotlin.test.assertTrue
 
+@ExperimentalCoroutinesApi
 class SuspendableBindingTest {
 
     private object BindingError
 
     @Test
-    fun returnsOkIfAllBindsSuccessful() {
+    fun returnsOkIfAllBindsSuccessful() = runTest {
         suspend fun provideX(): Result<Int, BindingError> {
             delay(1)
             return Ok(1)
@@ -26,23 +28,20 @@ class SuspendableBindingTest {
             return Ok(2)
         }
 
-        return runBlockingTest {
-            val result = binding<Int, BindingError> {
-                val x = provideX().bind()
-                val y = provideY().bind()
-                x + y
-            }
-
-            assertTrue(result is Ok)
-            assertEquals(
-                expected = 3,
-                actual = result.value
-            )
+        val result = binding<Int, BindingError> {
+            val x = provideX().bind()
+            val y = provideY().bind()
+            x + y
         }
+
+        assertEquals(
+            expected = Ok(3),
+            actual = result
+        )
     }
 
     @Test
-    fun returnsOkIfAllBindsOfDifferentTypeAreSuccessful() {
+    fun returnsOkIfAllBindsOfDifferentTypeAreSuccessful() = runTest {
         suspend fun provideX(): Result<String, BindingError> {
             delay(1)
             return Ok("1")
@@ -53,23 +52,20 @@ class SuspendableBindingTest {
             return Ok(x + 2)
         }
 
-        return runBlockingTest {
-            val result = binding<Int, BindingError> {
-                val x = provideX().bind()
-                val y = provideY(x.toInt()).bind()
-                y
-            }
-
-            assertTrue(result is Ok)
-            assertEquals(
-                expected = 3,
-                actual = result.value
-            )
+        val result = binding<Int, BindingError> {
+            val x = provideX().bind()
+            val y = provideY(x.toInt()).bind()
+            y
         }
+
+        assertEquals(
+            expected = Ok(3),
+            actual = result
+        )
     }
 
     @Test
-    fun returnsFirstErrIfBindingFailed() {
+    fun returnsFirstErrIfBindingFailed() = runTest {
         suspend fun provideX(): Result<Int, BindingError> {
             delay(1)
             return Ok(1)
@@ -85,27 +81,25 @@ class SuspendableBindingTest {
             return Ok(2)
         }
 
-        return runBlockingTest {
-            val result = binding<Int, BindingError> {
-                val x = provideX().bind()
-                val y = provideY().bind()
-                val z = provideZ().bind()
-                x + y + z
-            }
-
-            assertTrue(result is Err)
-            assertEquals(
-                expected = BindingError,
-                actual = result.error
-            )
+        val result = binding<Int, BindingError> {
+            val x = provideX().bind()
+            val y = provideY().bind()
+            val z = provideZ().bind()
+            x + y + z
         }
+
+        assertEquals(
+            expected = Err(BindingError),
+            actual = result
+        )
     }
 
     @Test
-    fun returnsStateChangedUntilFirstBindFailed() {
+    fun returnsStateChangedUntilFirstBindFailed() = runTest {
         var xStateChange = false
         var yStateChange = false
         var zStateChange = false
+
         suspend fun provideX(): Result<Int, BindingError> {
             delay(1)
             xStateChange = true
@@ -124,27 +118,25 @@ class SuspendableBindingTest {
             return Err(BindingError)
         }
 
-        runBlockingTest {
-            val result = binding<Int, BindingError> {
-                val x = provideX().bind()
-                val y = provideY().bind()
-                val z = provideZ().bind()
-                x + y + z
-            }
-
-            assertTrue(result is Err)
-            assertEquals(
-                expected = BindingError,
-                actual = result.error
-            )
-            assertTrue(xStateChange)
-            assertTrue(yStateChange)
-            assertFalse(zStateChange)
+        val result = binding<Int, BindingError> {
+            val x = provideX().bind()
+            val y = provideY().bind()
+            val z = provideZ().bind()
+            x + y + z
         }
+
+        assertEquals(
+            expected = Err(BindingError),
+            actual = result
+        )
+
+        assertTrue(xStateChange)
+        assertTrue(yStateChange)
+        assertFalse(zStateChange)
     }
 
     @Test
-    fun returnsFirstErrIfBindingsOfDifferentTypesFailed() {
+    fun returnsFirstErrIfBindingsOfDifferentTypesFailed() = runTest {
         suspend fun provideX(): Result<Int, BindingError> {
             delay(1)
             return Ok(1)
@@ -160,19 +152,16 @@ class SuspendableBindingTest {
             return Ok(2)
         }
 
-        return runBlockingTest {
-            val result = binding<Int, BindingError> {
-                val x = provideX().bind()
-                val y = provideY().bind()
-                val z = provideZ().bind()
-                x + y.toInt() + z
-            }
-
-            assertTrue(result is Err)
-            assertEquals(
-                expected = BindingError,
-                actual = result.error
-            )
+        val result = binding<Int, BindingError> {
+            val x = provideX().bind()
+            val y = provideY().bind()
+            val z = provideZ().bind()
+            x + y.toInt() + z
         }
+
+        assertEquals(
+            expected = Err(BindingError),
+            actual = result
+        )
     }
 }
diff --git a/...-coroutines/src/jsTest/kotlin/com.github.michaelbull.result.coroutines/RunBlockingTest.kt b/...-coroutines/src/jsTest/kotlin/com.github.michaelbull.result.coroutines/RunBlockingTest.kt