diff --git a/buildSrc/src/main/java/com/squareup/workflow1/catalogs.kt b/buildSrc/src/main/java/com/squareup/workflow1/catalogs.kt index 2441bbaa8..31b9a7db4 100644 --- a/buildSrc/src/main/java/com/squareup/workflow1/catalogs.kt +++ b/buildSrc/src/main/java/com/squareup/workflow1/catalogs.kt @@ -19,3 +19,8 @@ val Project.libsCatalog: VersionCatalog fun VersionCatalog.library(alias: String): Provider { return findLibrary(alias).get() } + +@Suppress("UnstableApiUsage") +fun VersionCatalog.version(alias: String): String { + return findVersion(alias).get().requiredVersion +} diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index 65d2887e4..2fb8ca8de 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -53,7 +53,7 @@ com.google.code.findbugs:jsr305:3.0.2 com.google.code.gson:gson:2.8.9 com.google.crypto.tink:tink:1.3.0-rc2 com.google.dagger:dagger:2.28.3 -com.google.devtools.ksp:symbol-processing-gradle-plugin:1.6.21-1.0.6 +com.google.devtools.ksp:symbol-processing-gradle-plugin:1.7.10-1.0.6 com.google.errorprone:error_prone_annotations:2.4.0 com.google.flatbuffers:flatbuffers-java:1.12.0 com.google.guava:failureaccess:1.0.1 @@ -128,33 +128,35 @@ org.jdom:jdom2:2.0.6 org.jetbrains.dokka:dokka-core:1.5.31 org.jetbrains.dokka:dokka-gradle-plugin:1.5.31 org.jetbrains.intellij.deps:trove4j:1.0.20200330 -org.jetbrains.kotlin:kotlin-android-extensions:1.6.21 -org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.21 -org.jetbrains.kotlin:kotlin-build-common:1.6.21 -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21 -org.jetbrains.kotlin:kotlin-compiler-runner:1.6.21 -org.jetbrains.kotlin:kotlin-daemon-client:1.6.21 -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21 -org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21 -org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.21 -org.jetbrains.kotlin:kotlin-native-utils:1.6.21 -org.jetbrains.kotlin:kotlin-project-model:1.6.21 +org.jetbrains.kotlin:kotlin-android-extensions:1.7.10 +org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10 +org.jetbrains.kotlin:kotlin-build-common:1.7.10 +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10 +org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10 +org.jetbrains.kotlin:kotlin-daemon-client:1.7.10 +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10 +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10 +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10 +org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10 +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10 +org.jetbrains.kotlin:kotlin-native-utils:1.7.10 +org.jetbrains.kotlin:kotlin-project-model:1.7.10 org.jetbrains.kotlin:kotlin-reflect:1.6.21 -org.jetbrains.kotlin:kotlin-scripting-common:1.6.21 -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21 -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21 -org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21 -org.jetbrains.kotlin:kotlin-serialization:1.6.21 +org.jetbrains.kotlin:kotlin-scripting-common:1.7.10 +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10 +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10 +org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10 +org.jetbrains.kotlin:kotlin-serialization:1.7.10 org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 org.jetbrains.kotlin:kotlin-stdlib:1.6.21 -org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.21 -org.jetbrains.kotlin:kotlin-util-io:1.6.21 +org.jetbrains.kotlin:kotlin-tooling-core:1.7.10 +org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10 +org.jetbrains.kotlin:kotlin-util-io:1.7.10 org.jetbrains.kotlin:kotlin-util-klib-metadata:1.6.0 -org.jetbrains.kotlin:kotlin-util-klib:1.6.21 +org.jetbrains.kotlin:kotlin-util-klib:1.7.10 org.jetbrains.kotlinx:binary-compatibility-validator:0.11.1 org.jetbrains.kotlinx:kotlinx-benchmark-plugin:0.4.2 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.1 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9dee05445..6fb948f4d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -11,7 +11,7 @@ androidx-appcompat = "1.3.1" androidx-benchmark = "1.1.0-rc03" androidx-cardview = "1.0.0" androidx-compose = "1.1.0-rc01" -androidx-compose-compiler = "1.2.0-rc02" +androidx-compose-compiler = "1.3.1" androidx-constraintlayout = "2.1.2" androidx-core = "1.6.0" androidx-fragment = "1.3.6" @@ -39,7 +39,7 @@ dependencyGuard = "0.1.0" google-accompanist = "0.18.0" google-dagger = "2.40.5" -google-ksp = "1.6.21-1.0.6" +google-ksp = "1.7.10-1.0.6" google-material = "1.4.0" groovy = "3.0.9" @@ -47,7 +47,7 @@ jUnit = "4.13.2" javaParser = "3.24.0" jmh = "1.34" kotest = "5.1.0" -kotlin = "1.6.21" +kotlin = "1.7.10" kotlinx-binary-compatibility = "0.11.1" kotlinx-coroutines = "1.6.4" @@ -222,7 +222,7 @@ robolectric-annotations = { module = "org.robolectric:annotations", version.ref rxjava2-rxandroid = { module = "io.reactivex.rxjava2:rxandroid", version.ref = "rxjava2-android" } rxjava2-rxjava = { module = "io.reactivex.rxjava2:rxjava", version.ref = "rxjava2-core" } -squareup-curtains = { module = "com.squareup.curtains:curtains", version.ref = "squareup-curtains"} +squareup-curtains = { module = "com.squareup.curtains:curtains", version.ref = "squareup-curtains" } squareup-cycler = { module = "com.squareup.cycler:cycler", version.ref = "squareup-cycler" } diff --git a/internal-testing-utils/dependencies/runtimeClasspath.txt b/internal-testing-utils/dependencies/runtimeClasspath.txt index 68187476e..5739c6a22 100644 --- a/internal-testing-utils/dependencies/runtimeClasspath.txt +++ b/internal-testing-utils/dependencies/runtimeClasspath.txt @@ -1,6 +1,6 @@ -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.10 org.jetbrains:annotations:13.0 diff --git a/samples/hello-terminal/todo-terminal-app/src/main/java/com/squareup/sample/hellotodo/TodoWorkflow.kt b/samples/hello-terminal/todo-terminal-app/src/main/java/com/squareup/sample/hellotodo/TodoWorkflow.kt index 662bba30e..b0892df33 100644 --- a/samples/hello-terminal/todo-terminal-app/src/main/java/com/squareup/sample/hellotodo/TodoWorkflow.kt +++ b/samples/hello-terminal/todo-terminal-app/src/main/java/com/squareup/sample/hellotodo/TodoWorkflow.kt @@ -70,7 +70,6 @@ class TodoWorkflow : TerminalWorkflow, return TerminalRendering( buildString { - @Suppress("UNCHECKED_CAST") appendLine(renderState.renderTitle(renderProps, context)) appendLine(renderSelection(renderState.titleSeparator, false)) appendLine(renderState.renderItems(renderProps, context)) @@ -81,13 +80,13 @@ class TodoWorkflow : TerminalWorkflow, override fun snapshotState(state: TodoList): Snapshot? = null private fun onKeystroke(key: KeyStroke) = action { - @Suppress("NON_EXHAUSTIVE_WHEN_STATEMENT") when (key.keyType) { ArrowUp -> state = state.moveFocusUp() ArrowDown -> state = state.moveFocusDown() Enter -> if (state.focusedField > TITLE_FIELD_INDEX) { state = state.toggleChecked(state.focusedField) } + else -> {} } } } diff --git a/trace-encoder/dependencies/runtimeClasspath.txt b/trace-encoder/dependencies/runtimeClasspath.txt index 6bd7fd237..fe3d3c2a7 100644 --- a/trace-encoder/dependencies/runtimeClasspath.txt +++ b/trace-encoder/dependencies/runtimeClasspath.txt @@ -2,11 +2,11 @@ com.squareup.moshi:moshi-adapters:1.13.0 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.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt index 098d32310..f52dbf19a 100644 --- a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt @@ -2,11 +2,11 @@ :workflow-runtime com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt index 098d32310..f52dbf19a 100644 --- a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt +++ b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt @@ -2,11 +2,11 @@ :workflow-runtime com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-core/dependencies/jvmRuntimeClasspath.txt b/workflow-core/dependencies/jvmRuntimeClasspath.txt index acf48696a..3115b23c0 100644 --- a/workflow-core/dependencies/jvmRuntimeClasspath.txt +++ b/workflow-core/dependencies/jvmRuntimeClasspath.txt @@ -1,9 +1,9 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-core/dependencies/runtimeClasspath.txt b/workflow-core/dependencies/runtimeClasspath.txt index 15c3f4259..b7ccb0131 100644 --- a/workflow-core/dependencies/runtimeClasspath.txt +++ b/workflow-core/dependencies/runtimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt index c727556de..2f55330d9 100644 --- a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt +++ b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/BaseRenderContext.kt @@ -1,4 +1,5 @@ -@file:Suppress("EXPERIMENTAL_API_USAGE") +// Type variance issue: https://github.com/square/workflow-kotlin/issues/891 +@file:Suppress("EXPERIMENTAL_API_USAGE", "TYPE_VARIANCE_CONFLICT_WARNING") @file:JvmMultifileClass @file:JvmName("Workflows") @@ -257,7 +258,7 @@ BaseRenderContext.runningWorker( runningWorker(worker, key) { // The compiler thinks this code is unreachable, and it is correct. But we have to pass a lambda // here so we might as well check at runtime as well. - @Suppress("UNREACHABLE_CODE", "ThrowableNotThrown") + @Suppress("UNREACHABLE_CODE") throw AssertionError("Worker emitted $it") } } @@ -275,7 +276,6 @@ BaseRenderContext.runningWorker( * * @param key An optional string key that is used to distinguish between identical [Worker]s. */ -@OptIn(ExperimentalStdlibApi::class) public inline fun , PropsT, StateT, OutputT> BaseRenderContext.runningWorker( worker: W, @@ -293,7 +293,6 @@ BaseRenderContext.runningWorker( * @param workerType `typeOf()` * @param key An optional string key that is used to distinguish between identical [Worker]s. */ -@OptIn(ExperimentalStdlibApi::class) @PublishedApi internal fun BaseRenderContext.runningWorker( diff --git a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt index 62b6a000c..e2d5e8003 100644 --- a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt +++ b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt @@ -1,10 +1,10 @@ :workflow-core com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-runtime/dependencies/jvmWorkflowNodeRuntimeClasspath.txt b/workflow-runtime/dependencies/jvmWorkflowNodeRuntimeClasspath.txt index 90f00412d..0d8bd23ad 100644 --- a/workflow-runtime/dependencies/jvmWorkflowNodeRuntimeClasspath.txt +++ b/workflow-runtime/dependencies/jvmWorkflowNodeRuntimeClasspath.txt @@ -3,10 +3,10 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 net.sf.jopt-simple:jopt-simple:5.0.4 org.apache.commons:commons-math3:3.2 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.10 org.jetbrains.kotlinx:kotlinx-benchmark-runtime-jvm:0.4.2 org.jetbrains.kotlinx:kotlinx-benchmark-runtime:0.4.2 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4 diff --git a/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/RealRenderContext.kt b/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/RealRenderContext.kt index 5fd78266b..f4572f7ef 100644 --- a/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/RealRenderContext.kt +++ b/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/RealRenderContext.kt @@ -1,5 +1,3 @@ -@file:Suppress("DEPRECATION") - package com.squareup.workflow1.internal import com.squareup.workflow1.BaseRenderContext diff --git a/workflow-rx2/dependencies/runtimeClasspath.txt b/workflow-rx2/dependencies/runtimeClasspath.txt index fd40535b5..e0ac7d6ca 100644 --- a/workflow-rx2/dependencies/runtimeClasspath.txt +++ b/workflow-rx2/dependencies/runtimeClasspath.txt @@ -2,11 +2,11 @@ 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.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-testing/dependencies/runtimeClasspath.txt b/workflow-testing/dependencies/runtimeClasspath.txt index 70c069123..dfb197031 100644 --- a/workflow-testing/dependencies/runtimeClasspath.txt +++ b/workflow-testing/dependencies/runtimeClasspath.txt @@ -4,12 +4,12 @@ :workflow-runtime com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-reflect:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-reflect:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-tracing/dependencies/runtimeClasspath.txt b/workflow-tracing/dependencies/runtimeClasspath.txt index 95357555a..7fd582c98 100644 --- a/workflow-tracing/dependencies/runtimeClasspath.txt +++ b/workflow-tracing/dependencies/runtimeClasspath.txt @@ -5,11 +5,11 @@ com.squareup.moshi:moshi-adapters:1.13.0 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.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt index 6fcb45540..b022f71e6 100644 --- a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt @@ -40,11 +40,11 @@ androidx.transition:transition:1.4.1 androidx.versionedparcelable:versionedparcelable:1.1.1 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt index c3c327ac3..f12ebe36f 100644 --- a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt @@ -35,11 +35,11 @@ androidx.transition:transition:1.4.1 androidx.versionedparcelable:versionedparcelable:1.1.1 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt index c917e24a4..5a27073f8 100644 --- a/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/container-android/dependencies/releaseRuntimeClasspath.txt @@ -35,11 +35,11 @@ androidx.versionedparcelable:versionedparcelable:1.1.1 androidx.viewpager:viewpager:1.0.0 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-ui/container-common/dependencies/runtimeClasspath.txt b/workflow-ui/container-common/dependencies/runtimeClasspath.txt index d41db0be9..1ec6668a7 100644 --- a/workflow-ui/container-common/dependencies/runtimeClasspath.txt +++ b/workflow-ui/container-common/dependencies/runtimeClasspath.txt @@ -1,11 +1,11 @@ :workflow-ui:core-common com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt index b066be5e5..073f71348 100644 --- a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt @@ -21,11 +21,11 @@ androidx.transition:transition:1.4.1 androidx.versionedparcelable:versionedparcelable:1.1.1 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-ui/core-common/dependencies/runtimeClasspath.txt b/workflow-ui/core-common/dependencies/runtimeClasspath.txt index 15c3f4259..b7ccb0131 100644 --- a/workflow-ui/core-common/dependencies/runtimeClasspath.txt +++ b/workflow-ui/core-common/dependencies/runtimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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 diff --git a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt index 141d1c4ab..dfa4dddb2 100644 --- a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt @@ -24,11 +24,11 @@ com.squareup.curtains:curtains:1.2.1 com.squareup.okio:okio-jvm:3.0.0 com.squareup.okio:okio:3.0.0 com.squareup.radiography:radiography:2.4.0 -org.jetbrains.kotlin:kotlin-bom:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-common:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.21 -org.jetbrains.kotlin:kotlin-stdlib:1.6.21 +org.jetbrains.kotlin:kotlin-bom:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10 +org.jetbrains.kotlin:kotlin-stdlib:1.7.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