From 3427e030b36f38b4b0262db312c7a74561d23175 Mon Sep 17 00:00:00 2001 From: Stephen Edwards Date: Fri, 9 Jun 2023 15:27:27 -0400 Subject: [PATCH] Update coroutines 1.6.4 -> 1.7.1 --- gradle/libs.versions.toml | 2 +- .../dependencies/runtimeClasspath.txt | 16 ++++++++-------- .../dependencies/releaseRuntimeClasspath.txt | 16 ++++++++-------- .../dependencies/runtimeClasspath.txt | 16 ++++++++-------- .../dependencies/jsRuntimeClasspath.txt | 10 +++++----- .../dependencies/jvmRuntimeClasspath.txt | 8 ++++---- .../dependencies/runtimeClasspath.txt | 10 +++++----- .../dependencies/jsRuntimeClasspath.txt | 10 +++++----- .../dependencies/jvmRuntimeClasspath.txt | 14 +++++++------- .../workflow1/internal/WorkflowNode.kt | 3 ++- .../workflow1/internal/WorkflowRunner.kt | 7 ++++--- workflow-rx2/dependencies/runtimeClasspath.txt | 14 +++++++------- .../dependencies/runtimeClasspath.txt | 14 +++++++------- .../squareup/workflow1/testing/WorkerTester.kt | 3 ++- .../workflow1/testing/WorkflowTestRuntime.kt | 3 ++- .../dependencies/runtimeClasspath.txt | 16 ++++++++-------- .../dependencies/releaseRuntimeClasspath.txt | 18 +++++++++--------- .../dependencies/releaseRuntimeClasspath.txt | 18 +++++++++--------- .../dependencies/releaseRuntimeClasspath.txt | 12 ++++++------ .../dependencies/runtimeClasspath.txt | 10 +++++----- .../dependencies/releaseRuntimeClasspath.txt | 12 ++++++------ .../dependencies/runtimeClasspath.txt | 10 +++++----- .../dependencies/releaseRuntimeClasspath.txt | 18 +++++++++--------- 23 files changed, 132 insertions(+), 128 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c8c046adb..a2e7c5589 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -51,7 +51,7 @@ kotest = "5.1.0" kotlin = "1.8.10" kotlinx-binary-compatibility = "0.11.1" -kotlinx-coroutines = "1.6.4" +kotlinx-coroutines = "1.7.1" kotlinx-serialization-json = "1.3.2" kotlinx-atomicfu = "0.17.2" diff --git a/trace-encoder/dependencies/runtimeClasspath.txt b/trace-encoder/dependencies/runtimeClasspath.txt index 5d27025c2..8e1e76cbc 100644 --- a/trace-encoder/dependencies/runtimeClasspath.txt +++ b/trace-encoder/dependencies/runtimeClasspath.txt @@ -3,11 +3,11 @@ com.squareup.moshi:moshi:1.13.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib:1.8.20 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt index 231f4b67e..88b52d4b3 100644 --- a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt @@ -3,11 +3,11 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib:1.8.20 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt index 231f4b67e..88b52d4b3 100644 --- a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt +++ b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt @@ -3,11 +3,11 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib:1.8.20 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-core/dependencies/jsRuntimeClasspath.txt b/workflow-core/dependencies/jsRuntimeClasspath.txt index aa32047fd..28f247bb6 100644 --- a/workflow-core/dependencies/jsRuntimeClasspath.txt +++ b/workflow-core/dependencies/jsRuntimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-js:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:atomicfu:1.6.21 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-js:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-js:1.8.20 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:atomicfu-js:0.17.3 -org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 +org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.8.20 +org.jetbrains.kotlinx:atomicfu-js:0.20.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 org.jetbrains:annotations:13.0 diff --git a/workflow-core/dependencies/jvmRuntimeClasspath.txt b/workflow-core/dependencies/jvmRuntimeClasspath.txt index 48ad565c0..ae34ead52 100644 --- a/workflow-core/dependencies/jvmRuntimeClasspath.txt +++ b/workflow-core/dependencies/jvmRuntimeClasspath.txt @@ -4,7 +4,7 @@ org.jetbrains.kotlin:kotlin-bom:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-core/dependencies/runtimeClasspath.txt b/workflow-core/dependencies/runtimeClasspath.txt index 9be0fbd1a..3d4e96caf 100644 --- a/workflow-core/dependencies/runtimeClasspath.txt +++ b/workflow-core/dependencies/runtimeClasspath.txt @@ -1,11 +1,11 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-runtime/dependencies/jsRuntimeClasspath.txt b/workflow-runtime/dependencies/jsRuntimeClasspath.txt index 009fa0cbf..fbf5f8428 100644 --- a/workflow-runtime/dependencies/jsRuntimeClasspath.txt +++ b/workflow-runtime/dependencies/jsRuntimeClasspath.txt @@ -1,11 +1,11 @@ :workflow-core com.squareup.okio:okio-js:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:atomicfu:1.6.21 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-js:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-js:1.8.20 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:atomicfu-js:0.17.3 -org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 +org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.8.20 +org.jetbrains.kotlinx:atomicfu-js:0.20.2 +org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 org.jetbrains:annotations:13.0 diff --git a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt index 30b11c872..cd45c0770 100644 --- a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt +++ b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt @@ -2,10 +2,10 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib:1.8.20 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowNode.kt b/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowNode.kt index beb581f26..22f008068 100644 --- a/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowNode.kt +++ b/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowNode.kt @@ -20,6 +20,7 @@ import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineName import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineStart.LAZY +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job import kotlinx.coroutines.cancel @@ -164,7 +165,7 @@ internal class WorkflowNode( * @return [Boolean] whether or not the queues were empty for this node and its children at the * time of suspending. */ - @OptIn(ExperimentalCoroutinesApi::class) + @OptIn(ExperimentalCoroutinesApi::class, DelicateCoroutinesApi::class) fun onNextAction(selector: SelectBuilder): Boolean { // Listen for any child workflow updates. var empty = subtreeManager.onNextChildAction(selector) diff --git a/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowRunner.kt b/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowRunner.kt index 2794cd07a..e19f190d8 100644 --- a/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowRunner.kt +++ b/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowRunner.kt @@ -12,12 +12,13 @@ import com.squareup.workflow1.WorkflowExperimentalRuntime import com.squareup.workflow1.WorkflowInterceptor import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.FlowPreview import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.dropWhile import kotlinx.coroutines.flow.produceIn import kotlinx.coroutines.selects.SelectBuilder +import kotlinx.coroutines.selects.onTimeout import kotlinx.coroutines.selects.select @OptIn(ExperimentalCoroutinesApi::class) @@ -44,7 +45,6 @@ internal class WorkflowRunner( // Note that currentProps is only set by processActions receiving from this channel, // which can't happen until the dropWhile predicate evaluates to false, after which the dropWhile // predicate will never be invoked again, so it's fine to read the mutable value here. - @OptIn(FlowPreview::class) private val propsChannel = props.dropWhile { it == currentProps } .produceIn(scope) @@ -90,7 +90,7 @@ internal class WorkflowRunner( if (!waitForAnAction && runtimeConfig.contains(CONFLATE_STALE_RENDERINGS) && empty) { // With CONFLATE_STALE_RENDERINGS if there are no queued actions and we are not // waiting for one, then return ActionsExhausted and pass the rendering on. - onTimeout(0) { + onTimeout(timeMillis = 0) { // This will select synchronously since time is 0. ActionsExhausted } @@ -98,6 +98,7 @@ internal class WorkflowRunner( } } + @OptIn(DelicateCoroutinesApi::class) private fun SelectBuilder.onPropsUpdated() { // Stop trying to read from the inputs channel after it's closed. if (!propsChannel.isClosedForReceive) { diff --git a/workflow-rx2/dependencies/runtimeClasspath.txt b/workflow-rx2/dependencies/runtimeClasspath.txt index 99518ca34..283fffbb2 100644 --- a/workflow-rx2/dependencies/runtimeClasspath.txt +++ b/workflow-rx2/dependencies/runtimeClasspath.txt @@ -3,14 +3,14 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 io.reactivex.rxjava2:rxjava:2.2.21 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-reactive:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-rx2:1.7.1 +org.jetbrains:annotations:23.0.0 org.reactivestreams:reactive-streams:1.0.4 diff --git a/workflow-testing/dependencies/runtimeClasspath.txt b/workflow-testing/dependencies/runtimeClasspath.txt index feb234e7d..acb5b1656 100644 --- a/workflow-testing/dependencies/runtimeClasspath.txt +++ b/workflow-testing/dependencies/runtimeClasspath.txt @@ -8,13 +8,13 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 org.jetbrains.kotlin:kotlin-reflect:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-test-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkerTester.kt b/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkerTester.kt index 3ba94da61..8e867a57f 100644 --- a/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkerTester.kt +++ b/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkerTester.kt @@ -6,6 +6,7 @@ import app.cash.turbine.Event.Item import app.cash.turbine.test import com.squareup.workflow1.Worker import com.squareup.workflow1.testing.WorkflowTestRuntime.Companion.DEFAULT_TIMEOUT_MS +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.test.TestCoroutineScheduler import kotlinx.coroutines.test.runTest @@ -63,7 +64,7 @@ public interface WorkerTester { /** * Test a [Worker] by defining assertions on its output within [block]. */ -@OptIn(ExperimentalCoroutinesApi::class) +@OptIn(DelicateCoroutinesApi::class) public fun Worker.test( timeoutMs: Long = DEFAULT_TIMEOUT_MS, block: suspend WorkerTester.() -> Unit diff --git a/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkflowTestRuntime.kt b/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkflowTestRuntime.kt index 9b7b269db..7131c52de 100644 --- a/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkflowTestRuntime.kt +++ b/workflow-testing/src/main/java/com/squareup/workflow1/testing/WorkflowTestRuntime.kt @@ -19,6 +19,7 @@ import com.squareup.workflow1.testing.WorkflowTestParams.StartMode.StartFromWork import kotlinx.coroutines.CancellationException import kotlinx.coroutines.CoroutineExceptionHandler import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.DelicateCoroutinesApi import kotlinx.coroutines.Dispatchers.Unconfined import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.Job @@ -95,6 +96,7 @@ public class WorkflowTestRuntime @TestOnly internal */ public val hasOutput: Boolean get() = !outputs.isEmptyOrClosed + @OptIn(DelicateCoroutinesApi::class) private val ReceiveChannel<*>.isEmptyOrClosed get() = isEmpty || isClosedForReceive /** @@ -321,7 +323,6 @@ private fun WorkflowTestParams<*>.createInterceptors(): List unwrapCancellationCause(block: () -> T): T { try { return block() diff --git a/workflow-tracing/dependencies/runtimeClasspath.txt b/workflow-tracing/dependencies/runtimeClasspath.txt index f46cefc2f..62f670644 100644 --- a/workflow-tracing/dependencies/runtimeClasspath.txt +++ b/workflow-tracing/dependencies/runtimeClasspath.txt @@ -6,11 +6,11 @@ com.squareup.moshi:moshi:1.13.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib:1.8.20 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt index d682b7792..d6da66f36 100644 --- a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt @@ -48,12 +48,12 @@ com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib:1.8.20 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt index 683b2c371..833e3d383 100644 --- a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt @@ -44,12 +44,12 @@ com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib:1.8.20 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt index 7bdefe2e8..ecae93970 100644 --- a/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt @@ -43,12 +43,12 @@ com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-ui/container-common/dependencies/runtimeClasspath.txt b/workflow-ui/container-common/dependencies/runtimeClasspath.txt index 414c44a62..ce4dbbcd4 100644 --- a/workflow-ui/container-common/dependencies/runtimeClasspath.txt +++ b/workflow-ui/container-common/dependencies/runtimeClasspath.txt @@ -2,11 +2,11 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt index a91f9e0c3..d13ef6bb8 100644 --- a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt @@ -24,12 +24,12 @@ com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-ui/core-common/dependencies/runtimeClasspath.txt b/workflow-ui/core-common/dependencies/runtimeClasspath.txt index 9be0fbd1a..3d4e96caf 100644 --- a/workflow-ui/core-common/dependencies/runtimeClasspath.txt +++ b/workflow-ui/core-common/dependencies/runtimeClasspath.txt @@ -1,11 +1,11 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0 diff --git a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt index dc90d8768..56e0a14db 100644 --- a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt @@ -27,12 +27,12 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 com.squareup.radiography:radiography:2.4.1 org.jetbrains.kotlin:kotlin-bom:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.10 -org.jetbrains.kotlin:kotlin-stdlib:1.8.10 -org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4 -org.jetbrains:annotations:13.0 +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20 +org.jetbrains.kotlin:kotlin-stdlib:1.8.20 +org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1 +org.jetbrains:annotations:23.0.0