update kotlinx-coroutines (#2912)

* update kotlinx-coroutines

* create merge function

* clean up reference

* rm merge function and use copyforChild in mergeForChild

* clean up

* add annotation

kotest-assertions/kotest-assertions-shared/src/jvmMain/kotlin/io/kotest/assertions/ErrorCollector.kt

@@ -3,6 +3,7 @@
 package io.kotest.assertions
 
 import kotlinx.coroutines.CopyableThreadContextElement
+import kotlinx.coroutines.DelicateCoroutinesApi
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlin.coroutines.CoroutineContext
 
@@ -36,7 +37,7 @@ private class CoroutineLocalErrorCollector : BasicErrorCollector() {
 }
 
 
-@OptIn(ExperimentalCoroutinesApi::class)
+@OptIn(ExperimentalCoroutinesApi::class, DelicateCoroutinesApi::class)
 private class ErrorCollectorContextElement(private val coroutineLocalErrorCollector: CoroutineLocalErrorCollector) :
    CopyableThreadContextElement<CoroutineLocalErrorCollector> {
 
@@ -52,9 +53,11 @@ private class ErrorCollectorContextElement(private val coroutineLocalErrorCollec
       threadLocalErrorCollector.set(oldState)
    }
 
-   override fun copyForChildCoroutine(): CopyableThreadContextElement<CoroutineLocalErrorCollector> {
-      return ErrorCollectorContextElement(threadLocalErrorCollector.get().copy())
-   }
-
    companion object Key : CoroutineContext.Key<ErrorCollectorContextElement>
+
+   override fun copyForChild(): CopyableThreadContextElement<CoroutineLocalErrorCollector> =
+      ErrorCollectorContextElement(threadLocalErrorCollector.get().copy())
+
+   override fun mergeForChild(overwritingElement: CoroutineContext.Element): CoroutineContext =
+      copyForChild()
 }

versions.properties

@@ -62,7 +62,7 @@ version.kotest.extensions.mockserver=1.0.1
 
 version.kotlin=1.6.10
 
-version.kotlinx.coroutines=1.6.0
+version.kotlinx.coroutines=1.6.1
 
 ## unused
 version.kotlinx.datetime=0.2.1