diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000000..d263b35bab --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +registry=https://registry.yarnpkg.com \ No newline at end of file diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 07a23589b7..2c7dfa00c2 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -1,6 +1,6 @@ plugins { // Hardcoded as this is upstream of the version catalog. Keep this in sync with that. - kotlin("jvm") version "2.1.21" apply false + kotlin("jvm") version "2.0.21" apply false } dependencyResolutionManagement { diff --git a/dependencies/classpath.txt b/dependencies/classpath.txt index 7b0865708c..389f5a1ae1 100644 --- a/dependencies/classpath.txt +++ b/dependencies/classpath.txt @@ -55,13 +55,13 @@ com.google.android:annotations:4.1.1.4 com.google.api.grpc:proto-google-common-protos:2.17.0 com.google.auto.value:auto-value-annotations:1.6.2 com.google.code.findbugs:jsr305:3.0.2 -com.google.code.gson:gson:2.11.0 +com.google.code.gson:gson:2.10.1 com.google.crypto.tink:tink:1.7.0 com.google.dagger:dagger:2.28.3 -com.google.devtools.ksp:symbol-processing-api:2.1.21-2.0.1 -com.google.devtools.ksp:symbol-processing-common-deps:2.1.21-2.0.1 -com.google.devtools.ksp:symbol-processing-gradle-plugin:2.1.21-2.0.1 -com.google.errorprone:error_prone_annotations:2.27.0 +com.google.devtools.ksp:symbol-processing-api:2.0.21-1.0.26 +com.google.devtools.ksp:symbol-processing-common-deps:2.0.21-1.0.26 +com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.21-1.0.26 +com.google.errorprone:error_prone_annotations:2.18.0 com.google.flatbuffers:flatbuffers-java:1.12.0 com.google.guava:failureaccess:1.0.1 com.google.guava:guava:32.0.1-jre @@ -137,37 +137,38 @@ org.glassfish.jaxb:txw2:2.3.2 org.jdom:jdom2:2.0.6 org.jetbrains.dokka:dokka-core:2.0.0 org.jetbrains.dokka:dokka-gradle-plugin:2.0.0 -org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.21 -org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21 -org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.1.21 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-build-statistics:2.1.21 -org.jetbrains.kotlin:kotlin-build-tools-api:2.1.21 -org.jetbrains.kotlin:kotlin-compiler-runner:2.1.21 -org.jetbrains.kotlin:kotlin-daemon-client:2.1.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.1.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.1.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.1.21 -org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.1.21 -org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21 -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.1.21 -org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.1.21 -org.jetbrains.kotlin:kotlin-native-utils:2.1.21 +org.jetbrains.intellij.deps:trove4j:1.0.20200330 +org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.0.21 +org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-build-statistics:2.0.21 +org.jetbrains.kotlin:kotlin-build-tools-api:2.0.21 +org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21 +org.jetbrains.kotlin:kotlin-compiler-runner:2.0.21 +org.jetbrains.kotlin:kotlin-daemon-client:2.0.21 +org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.21 +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.21 +org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21 +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.21 +org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.21 +org.jetbrains.kotlin:kotlin-native-utils:2.0.21 org.jetbrains.kotlin:kotlin-reflect:2.0.20 -org.jetbrains.kotlin:kotlin-serialization:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 +org.jetbrains.kotlin:kotlin-serialization:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 org.jetbrains.kotlin:kotlin-stdlib:2.0.20 -org.jetbrains.kotlin:kotlin-tooling-core:2.1.21 -org.jetbrains.kotlin:kotlin-util-io:2.1.21 -org.jetbrains.kotlin:kotlin-util-klib-metadata:2.1.21 -org.jetbrains.kotlin:kotlin-util-klib:2.1.21 +org.jetbrains.kotlin:kotlin-tooling-core:2.0.21 +org.jetbrains.kotlin:kotlin-util-io:2.0.21 +org.jetbrains.kotlin:kotlin-util-klib:2.0.21 org.jetbrains.kotlinx:binary-compatibility-validator:0.17.0 -org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0 -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0 -org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0 +org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 +org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0 org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.0 org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 18e2ca7307..c177f72042 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -42,7 +42,7 @@ dependencyGuard = "0.5.0" google-accompanist = "0.18.0" google-dagger = "2.40.5" -google-ksp = "2.1.21-2.0.1" +google-ksp = "2.0.21-1.0.26" google-material = "1.4.0" groovy = "3.0.9" @@ -54,7 +54,7 @@ kgx = "0.1.12" kotest = "5.1.0" # Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream # of loading the library versions from this file but should be the same. -kotlin = "2.1.21" +kotlin = "2.0.21" kotlinx-binary-compatibility = "0.17.0" kotlinx-coroutines = "1.7.3" diff --git a/internal-testing-utils/dependencies/runtimeClasspath.txt b/internal-testing-utils/dependencies/runtimeClasspath.txt index ba19db34fb..f7191d3161 100644 --- a/internal-testing-utils/dependencies/runtimeClasspath.txt +++ b/internal-testing-utils/dependencies/runtimeClasspath.txt @@ -1,5 +1,5 @@ -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains:annotations:13.0 diff --git a/kotlin-js-store/yarn.lock b/kotlin-js-store/yarn.lock index aa482a6a7a..d3e469b54c 100644 --- a/kotlin-js-store/yarn.lock +++ b/kotlin-js-store/yarn.lock @@ -82,21 +82,37 @@ dependencies: "@types/node" "*" -"@types/estree@^1.0.5": +"@types/eslint-scope@^3.7.3": + version "3.7.7" + resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5" + integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg== + dependencies: + "@types/eslint" "*" + "@types/estree" "*" + +"@types/eslint@*": + version "9.6.1" + resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584" + integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag== + dependencies: + "@types/estree" "*" + "@types/json-schema" "*" + +"@types/estree@*", "@types/estree@^1.0.5": version "1.0.7" resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.7.tgz#4158d3105276773d5b7695cd4834b1722e4f37a8" integrity sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ== +"@types/json-schema@*", "@types/json-schema@^7.0.9": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" + integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== + "@types/json-schema@^7.0.8": version "7.0.11" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3" integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ== -"@types/json-schema@^7.0.9": - version "7.0.15" - resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" - integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== - "@types/node@*", "@types/node@>=10.0.0": version "18.14.0" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.0.tgz#94c47b9217bbac49d4a67a967fdcdeed89ebb7d0" @@ -674,7 +690,7 @@ engine.io@~6.6.0: engine.io-parser "~5.2.1" ws "~8.17.1" -enhanced-resolve@^5.17.1: +enhanced-resolve@^5.17.0: version "5.18.1" resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf" integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg== @@ -1146,10 +1162,10 @@ karma-webpack@5.0.1: minimatch "^9.0.3" webpack-merge "^4.1.5" -karma@6.4.4: - version "6.4.4" - resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492" - integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w== +karma@6.4.3: + version "6.4.3" + resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8" + integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q== dependencies: "@colors/colors" "1.5.0" body-parser "^1.19.0" @@ -1181,13 +1197,6 @@ kind-of@^6.0.2: resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw== -kotlin-web-helpers@2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286" - integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw== - dependencies: - format-util "^1.0.5" - loader-runner@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1" @@ -1291,10 +1300,10 @@ mkdirp@^0.5.5: dependencies: minimist "^1.2.6" -mocha@10.7.3: - version "10.7.3" - resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752" - integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A== +mocha@10.7.0: + version "10.7.0" + resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a" + integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA== dependencies: ansi-colors "^4.1.3" browser-stdout "^1.3.1" @@ -1891,11 +1900,12 @@ webpack-sources@^3.2.3: resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde" integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w== -webpack@5.94.0: - version "5.94.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f" - integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg== +webpack@5.93.0: + version "5.93.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5" + integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA== dependencies: + "@types/eslint-scope" "^3.7.3" "@types/estree" "^1.0.5" "@webassemblyjs/ast" "^1.12.1" "@webassemblyjs/wasm-edit" "^1.12.1" @@ -1904,7 +1914,7 @@ webpack@5.94.0: acorn-import-attributes "^1.9.5" browserslist "^4.21.10" chrome-trace-event "^1.0.2" - enhanced-resolve "^5.17.1" + enhanced-resolve "^5.17.0" es-module-lexer "^1.2.1" eslint-scope "5.1.1" events "^3.2.0" diff --git a/samples/dungeon/timemachine-shakeable/src/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineWorkflow.kt b/samples/dungeon/timemachine-shakeable/src/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineWorkflow.kt index bcf9c47961..cc002a1f74 100644 --- a/samples/dungeon/timemachine-shakeable/src/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineWorkflow.kt +++ b/samples/dungeon/timemachine-shakeable/src/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineWorkflow.kt @@ -24,7 +24,7 @@ import kotlin.time.ExperimentalTime * This workflow takes a [PropsFactory] as its props. See that class for more documentation. */ @ExperimentalTime -class ShakeableTimeMachineWorkflow( +class ShakeableTimeMachineWorkflow( private val timeMachineWorkflow: TimeMachineWorkflow, context: Context ) : StatefulWorkflow, State, O, ShakeableTimeMachineScreen>() { diff --git a/samples/dungeon/timemachine/src/main/java/com/squareup/sample/timemachine/TimeMachineWorkflow.kt b/samples/dungeon/timemachine/src/main/java/com/squareup/sample/timemachine/TimeMachineWorkflow.kt index aae0fbe89c..05b10483de 100644 --- a/samples/dungeon/timemachine/src/main/java/com/squareup/sample/timemachine/TimeMachineWorkflow.kt +++ b/samples/dungeon/timemachine/src/main/java/com/squareup/sample/timemachine/TimeMachineWorkflow.kt @@ -25,7 +25,7 @@ import kotlin.time.TimeSource * @param clock The [TimeSource] to use to assign timestamps to recorded values. */ @ExperimentalTime -class TimeMachineWorkflow( +class TimeMachineWorkflow( private val delegateWorkflow: Workflow, clock: TimeSource ) : StatelessWorkflow, O, TimeMachineRendering>() { diff --git a/samples/tutorial/build.gradle b/samples/tutorial/build.gradle index fd598f0319..53dcac5960 100644 --- a/samples/tutorial/build.gradle +++ b/samples/tutorial/build.gradle @@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { ext { - kotlin_version = '2.1.21' + kotlin_version = '2.0.21' workflow_version = "1.12.1-beta04" deps = [ diff --git a/trace-encoder/dependencies/runtimeClasspath.txt b/trace-encoder/dependencies/runtimeClasspath.txt index 6a1c249919..2d8720ca9f 100644 --- a/trace-encoder/dependencies/runtimeClasspath.txt +++ b/trace-encoder/dependencies/runtimeClasspath.txt @@ -2,11 +2,11 @@ com.squareup.moshi:moshi-adapters:1.15.0 com.squareup.moshi:moshi:1.15.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt index 16c625fdd2..1782411506 100644 --- a/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt index 16c625fdd2..1782411506 100644 --- a/workflow-config/config-jvm/dependencies/runtimeClasspath.txt +++ b/workflow-config/config-jvm/dependencies/runtimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-core/build.gradle.kts b/workflow-core/build.gradle.kts index 14754bb95d..c3c841f414 100644 --- a/workflow-core/build.gradle.kts +++ b/workflow-core/build.gradle.kts @@ -11,7 +11,7 @@ kotlin { iosWithSimulatorArm64() } if (targets == "kmp" || targets == "jvm") { - jvm { } + jvm { withJava() } } if (targets == "kmp" || targets == "js") { js(IR) { browser() } diff --git a/workflow-core/dependencies/jsRuntimeClasspath.txt b/workflow-core/dependencies/jsRuntimeClasspath.txt index 8107fe9e32..5017e868e5 100644 --- a/workflow-core/dependencies/jsRuntimeClasspath.txt +++ b/workflow-core/dependencies/jsRuntimeClasspath.txt @@ -1,9 +1,9 @@ com.squareup.okio:okio-js:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-dom-api-compat:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-js:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-dom-api-compat:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-js:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.8.20 org.jetbrains.kotlinx:atomicfu-js:0.21.0 org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.7.3 diff --git a/workflow-core/dependencies/jvmRuntimeClasspath.txt b/workflow-core/dependencies/jvmRuntimeClasspath.txt index 60878b1833..84ab7edf5d 100644 --- a/workflow-core/dependencies/jvmRuntimeClasspath.txt +++ b/workflow-core/dependencies/jvmRuntimeClasspath.txt @@ -1,9 +1,9 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-core/dependencies/runtimeClasspath.txt b/workflow-core/dependencies/runtimeClasspath.txt index 3d72a2ba12..1782411506 100644 --- a/workflow-core/dependencies/runtimeClasspath.txt +++ b/workflow-core/dependencies/runtimeClasspath.txt @@ -1,10 +1,10 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:1.9.24 -org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24 -org.jetbrains.kotlin:kotlin-stdlib:1.9.24 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/SessionWorkflow.kt b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/SessionWorkflow.kt index 28caa4424f..2462103ad2 100644 --- a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/SessionWorkflow.kt +++ b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/SessionWorkflow.kt @@ -23,7 +23,7 @@ public abstract class SessionWorkflow< PropsT, StateT, OutputT, - RenderingT + out RenderingT > : StatefulWorkflow() { /** diff --git a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatefulWorkflow.kt b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatefulWorkflow.kt index 7a02c8f61f..242be5f99e 100644 --- a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatefulWorkflow.kt +++ b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatefulWorkflow.kt @@ -72,7 +72,7 @@ public abstract class StatefulWorkflow< PropsT, StateT, OutputT, - RenderingT + out RenderingT > : Workflow, IdCacheable { public inner class RenderContext internal constructor( diff --git a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatelessWorkflow.kt b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatelessWorkflow.kt index 1d779d22f5..c13b47a9c4 100644 --- a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatelessWorkflow.kt +++ b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatelessWorkflow.kt @@ -25,7 +25,7 @@ import kotlin.jvm.JvmName * * @see StatefulWorkflow */ -public abstract class StatelessWorkflow : +public abstract class StatelessWorkflow : Workflow, IdCacheable { @Suppress("UNCHECKED_CAST") diff --git a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/Workflow.kt b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/Workflow.kt index 41370b68a3..cb49a961f7 100644 --- a/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/Workflow.kt +++ b/workflow-core/src/commonMain/kotlin/com/squareup/workflow1/Workflow.kt @@ -96,7 +96,7 @@ import kotlin.jvm.JvmName * @see StatefulWorkflow * @see StatelessWorkflow */ -public interface Workflow { +public interface Workflow { /** * Provides a [StatefulWorkflow] view of this workflow. Necessary because [StatefulWorkflow] is diff --git a/workflow-runtime/dependencies/jsRuntimeClasspath.txt b/workflow-runtime/dependencies/jsRuntimeClasspath.txt index 8107fe9e32..5017e868e5 100644 --- a/workflow-runtime/dependencies/jsRuntimeClasspath.txt +++ b/workflow-runtime/dependencies/jsRuntimeClasspath.txt @@ -1,9 +1,9 @@ com.squareup.okio:okio-js:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-dom-api-compat:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-js:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-dom-api-compat:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-js:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.8.20 org.jetbrains.kotlinx:atomicfu-js:0.21.0 org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.7.3 diff --git a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt index 60878b1833..84ab7edf5d 100644 --- a/workflow-runtime/dependencies/jvmRuntimeClasspath.txt +++ b/workflow-runtime/dependencies/jvmRuntimeClasspath.txt @@ -1,9 +1,9 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowChildNode.kt b/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowChildNode.kt index ec0b2322ae..ea2d468766 100644 --- a/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowChildNode.kt +++ b/workflow-runtime/src/commonMain/kotlin/com/squareup/workflow1/internal/WorkflowChildNode.kt @@ -56,7 +56,7 @@ internal class WorkflowChildNode< ): R { @Suppress("UNCHECKED_CAST") return workflowNode.render( - workflow as StatefulWorkflow, + workflow as StatefulWorkflow, props as ChildPropsT ) as R } 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 23ba5ff121..17dc3ff7d9 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 @@ -133,7 +133,7 @@ internal class WorkflowNode( */ @Suppress("UNCHECKED_CAST") fun render( - workflow: StatefulWorkflow, + workflow: StatefulWorkflow, input: PropsT ): RenderingT = renderWithStateType(workflow as StatefulWorkflow, input) diff --git a/workflow-rx2/dependencies/runtimeClasspath.txt b/workflow-rx2/dependencies/runtimeClasspath.txt index 2a92482e86..ce554412a1 100644 --- a/workflow-rx2/dependencies/runtimeClasspath.txt +++ b/workflow-rx2/dependencies/runtimeClasspath.txt @@ -1,11 +1,11 @@ com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 io.reactivex.rxjava2:rxjava:2.2.21 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-testing/dependencies/runtimeClasspath.txt b/workflow-testing/dependencies/runtimeClasspath.txt index 1ee851e582..bb653da669 100644 --- a/workflow-testing/dependencies/runtimeClasspath.txt +++ b/workflow-testing/dependencies/runtimeClasspath.txt @@ -2,12 +2,12 @@ app.cash.turbine:turbine-jvm:1.0.0 app.cash.turbine:turbine:1.0.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-reflect:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-reflect:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-trace-viewer/api/workflow-trace-viewer.api b/workflow-trace-viewer/api/workflow-trace-viewer.api index 099f7096aa..783954eb63 100644 --- a/workflow-trace-viewer/api/workflow-trace-viewer.api +++ b/workflow-trace-viewer/api/workflow-trace-viewer.api @@ -4,8 +4,9 @@ public final class com/squareup/workflow1/traceviewer/AppKt { public final class com/squareup/workflow1/traceviewer/ComposableSingletons$MainKt { public static final field INSTANCE Lcom/squareup/workflow1/traceviewer/ComposableSingletons$MainKt; + public static field lambda-1 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda$468449326$wf1_workflow_trace_viewer ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$wf1_workflow_trace_viewer ()Lkotlin/jvm/functions/Function3; } public final class com/squareup/workflow1/traceviewer/MainKt { diff --git a/workflow-tracing/dependencies/runtimeClasspath.txt b/workflow-tracing/dependencies/runtimeClasspath.txt index 6a1c249919..2d8720ca9f 100644 --- a/workflow-tracing/dependencies/runtimeClasspath.txt +++ b/workflow-tracing/dependencies/runtimeClasspath.txt @@ -2,11 +2,11 @@ com.squareup.moshi:moshi-adapters:1.15.0 com.squareup.moshi:moshi:1.15.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt index 09270242eb..cb5bebb1ee 100644 --- a/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose-tooling/dependencies/releaseRuntimeClasspath.txt @@ -76,11 +76,11 @@ androidx.versionedparcelable:versionedparcelable:1.1.1 com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 diff --git a/workflow-ui/compose/api/compose.api b/workflow-ui/compose/api/compose.api index 5c5a794399..189dfcecfa 100644 --- a/workflow-ui/compose/api/compose.api +++ b/workflow-ui/compose/api/compose.api @@ -1,9 +1,12 @@ public final class com/squareup/workflow1/ui/compose/ComposableSingletons$ScreenComposableFactoryFinderKt { public static final field INSTANCE Lcom/squareup/workflow1/ui/compose/ComposableSingletons$ScreenComposableFactoryFinderKt; + public static field lambda-1 Lkotlin/jvm/functions/Function3; + public static field lambda-2 Lkotlin/jvm/functions/Function3; + public static field lambda-3 Lkotlin/jvm/functions/Function3; public fun ()V - public final fun getLambda$-200952948$wf1_compose ()Lkotlin/jvm/functions/Function3; - public final fun getLambda$1517525760$wf1_compose ()Lkotlin/jvm/functions/Function3; - public final fun getLambda$2001334084$wf1_compose ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-1$wf1_compose ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-2$wf1_compose ()Lkotlin/jvm/functions/Function3; + public final fun getLambda-3$wf1_compose ()Lkotlin/jvm/functions/Function3; } public abstract interface class com/squareup/workflow1/ui/compose/ComposeScreen : com/squareup/workflow1/ui/Screen { diff --git a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt index 47dcbec86e..203f0af70a 100644 --- a/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/compose/dependencies/releaseRuntimeClasspath.txt @@ -70,11 +70,11 @@ androidx.versionedparcelable:versionedparcelable:1.1.1 com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 diff --git a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt index e3cf62c2cf..8ad63aa2f1 100644 --- a/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/core-android/dependencies/releaseRuntimeClasspath.txt @@ -36,11 +36,11 @@ androidx.versionedparcelable:versionedparcelable:1.1.1 com.google.guava:listenablefuture:1.0 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 diff --git a/workflow-ui/core-common/dependencies/runtimeClasspath.txt b/workflow-ui/core-common/dependencies/runtimeClasspath.txt index 16c625fdd2..1782411506 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.3.0 com.squareup.okio:okio:3.3.0 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3 diff --git a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt index e78f054da1..48859fad88 100644 --- a/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt +++ b/workflow-ui/radiography/dependencies/releaseRuntimeClasspath.txt @@ -38,11 +38,11 @@ com.squareup.curtains:curtains:1.2.2 com.squareup.okio:okio-jvm:3.3.0 com.squareup.okio:okio:3.3.0 com.squareup.radiography:radiography:2.4.1 -org.jetbrains.kotlin:kotlin-bom:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21 -org.jetbrains.kotlin:kotlin-stdlib:2.1.21 +org.jetbrains.kotlin:kotlin-bom:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21 +org.jetbrains.kotlin:kotlin-stdlib:2.0.21 org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3 org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3