Skip to content

Commit d7d8a1f

Browse files
steve-the-edwardssteve-the-edwards
authored
Merge pull request #1328 from square/sedwards/add-render-covariance
Kotlin 2.0.21 & Return 'out RenderingT' variance
2 parents da035df + 2369102 commit d7d8a1f

File tree

34 files changed

+174
-158
lines changed

34 files changed

+174
-158
lines changed

‎.npmrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
registry=https://registry.yarnpkg.com

‎build-logic/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
// Hardcoded as this is upstream of the version catalog. Keep this in sync with that.
3-
kotlin("jvm") version "2.1.21" apply false
3+
kotlin("jvm") version "2.0.21" apply false
44
}
55

66
dependencyResolutionManagement {

‎dependencies/classpath.txt

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,13 @@ com.google.android:annotations:4.1.1.4
5555
com.google.api.grpc:proto-google-common-protos:2.17.0
5656
com.google.auto.value:auto-value-annotations:1.6.2
5757
com.google.code.findbugs:jsr305:3.0.2
58-
com.google.code.gson:gson:2.11.0
58+
com.google.code.gson:gson:2.10.1
5959
com.google.crypto.tink:tink:1.7.0
6060
com.google.dagger:dagger:2.28.3
61-
com.google.devtools.ksp:symbol-processing-api:2.1.21-2.0.1
62-
com.google.devtools.ksp:symbol-processing-common-deps:2.1.21-2.0.1
63-
com.google.devtools.ksp:symbol-processing-gradle-plugin:2.1.21-2.0.1
64-
com.google.errorprone:error_prone_annotations:2.27.0
61+
com.google.devtools.ksp:symbol-processing-api:2.0.21-1.0.26
62+
com.google.devtools.ksp:symbol-processing-common-deps:2.0.21-1.0.26
63+
com.google.devtools.ksp:symbol-processing-gradle-plugin:2.0.21-1.0.26
64+
com.google.errorprone:error_prone_annotations:2.18.0
6565
com.google.flatbuffers:flatbuffers-java:1.12.0
6666
com.google.guava:failureaccess:1.0.1
6767
com.google.guava:guava:32.0.1-jre
@@ -137,37 +137,38 @@ org.glassfish.jaxb:txw2:2.3.2
137137
org.jdom:jdom2:2.0.6
138138
org.jetbrains.dokka:dokka-core:2.0.0
139139
org.jetbrains.dokka:dokka-gradle-plugin:2.0.0
140-
org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.1.21
141-
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.1.21
142-
org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.1.21
143-
org.jetbrains.kotlin:kotlin-bom:2.1.21
144-
org.jetbrains.kotlin:kotlin-build-statistics:2.1.21
145-
org.jetbrains.kotlin:kotlin-build-tools-api:2.1.21
146-
org.jetbrains.kotlin:kotlin-compiler-runner:2.1.21
147-
org.jetbrains.kotlin:kotlin-daemon-client:2.1.21
148-
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.1.21
149-
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.1.21
150-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.1.21
151-
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.1.21
152-
org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.1.21
153-
org.jetbrains.kotlin:kotlin-gradle-plugin:2.1.21
154-
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.1.21
155-
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.1.21
156-
org.jetbrains.kotlin:kotlin-native-utils:2.1.21
140+
org.jetbrains.intellij.deps:trove4j:1.0.20200330
141+
org.jetbrains.kotlin.plugin.compose:org.jetbrains.kotlin.plugin.compose.gradle.plugin:2.0.21
142+
org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21
143+
org.jetbrains.kotlin:kotlin-bom:2.0.21
144+
org.jetbrains.kotlin:kotlin-build-statistics:2.0.21
145+
org.jetbrains.kotlin:kotlin-build-tools-api:2.0.21
146+
org.jetbrains.kotlin:kotlin-compiler-embeddable:2.0.21
147+
org.jetbrains.kotlin:kotlin-compiler-runner:2.0.21
148+
org.jetbrains.kotlin:kotlin-daemon-client:2.0.21
149+
org.jetbrains.kotlin:kotlin-daemon-embeddable:2.0.21
150+
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.0.21
151+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.0.21
152+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.0.21
153+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.0.21
154+
org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.0.21
155+
org.jetbrains.kotlin:kotlin-gradle-plugin:2.0.21
156+
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.0.21
157+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.0.21
158+
org.jetbrains.kotlin:kotlin-native-utils:2.0.21
157159
org.jetbrains.kotlin:kotlin-reflect:2.0.20
158-
org.jetbrains.kotlin:kotlin-serialization:2.1.21
159-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
160-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
161-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
160+
org.jetbrains.kotlin:kotlin-serialization:2.0.21
161+
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
162+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
163+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
162164
org.jetbrains.kotlin:kotlin-stdlib:2.0.20
163-
org.jetbrains.kotlin:kotlin-tooling-core:2.1.21
164-
org.jetbrains.kotlin:kotlin-util-io:2.1.21
165-
org.jetbrains.kotlin:kotlin-util-klib-metadata:2.1.21
166-
org.jetbrains.kotlin:kotlin-util-klib:2.1.21
165+
org.jetbrains.kotlin:kotlin-tooling-core:2.0.21
166+
org.jetbrains.kotlin:kotlin-util-io:2.0.21
167+
org.jetbrains.kotlin:kotlin-util-klib:2.0.21
167168
org.jetbrains.kotlinx:binary-compatibility-validator:0.17.0
168-
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.8.0
169-
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0
170-
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0
169+
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
170+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
171+
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3
171172
org.jetbrains.kotlinx:kotlinx-serialization-bom:1.6.0
172173
org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.6.0
173174
org.jetbrains.kotlinx:kotlinx-serialization-core:1.6.0

‎gradle/libs.versions.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ dependencyGuard = "0.5.0"
4242

4343
google-accompanist = "0.18.0"
4444
google-dagger = "2.40.5"
45-
google-ksp = "2.1.21-2.0.1"
45+
google-ksp = "2.0.21-1.0.26"
4646
google-material = "1.4.0"
4747

4848
groovy = "3.0.9"
@@ -54,7 +54,7 @@ kgx = "0.1.12"
5454
kotest = "5.1.0"
5555
# Keep this in sync with what is hard-coded in build-logic/settings.gradle.kts as that is upstream
5656
# of loading the library versions from this file but should be the same.
57-
kotlin = "2.1.21"
57+
kotlin = "2.0.21"
5858

5959
kotlinx-binary-compatibility = "0.17.0"
6060
kotlinx-coroutines = "1.7.3"

‎internal-testing-utils/dependencies/runtimeClasspath.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
org.jetbrains.kotlin:kotlin-bom:2.1.21
2-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
3-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
4-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
1+
org.jetbrains.kotlin:kotlin-bom:2.0.21
2+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
3+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
4+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
55
org.jetbrains:annotations:13.0

‎kotlin-js-store/yarn.lock

Lines changed: 37 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,21 +82,37 @@
8282
dependencies:
8383
"@types/node" "*"
8484

85-
"@types/estree@^1.0.5":
85+
"@types/eslint-scope@^3.7.3":
86+
version "3.7.7"
87+
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
88+
integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
89+
dependencies:
90+
"@types/eslint" "*"
91+
"@types/estree" "*"
92+
93+
"@types/eslint@*":
94+
version "9.6.1"
95+
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-9.6.1.tgz#d5795ad732ce81715f27f75da913004a56751584"
96+
integrity sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==
97+
dependencies:
98+
"@types/estree" "*"
99+
"@types/json-schema" "*"
100+
101+
"@types/estree@*", "@types/estree@^1.0.5":
86102
version "1.0.7"
87103
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.7.tgz#4158d3105276773d5b7695cd4834b1722e4f37a8"
88104
integrity sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==
89105

106+
"@types/json-schema@*", "@types/json-schema@^7.0.9":
107+
version "7.0.15"
108+
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
109+
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
110+
90111
"@types/json-schema@^7.0.8":
91112
version "7.0.11"
92113
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.11.tgz#d421b6c527a3037f7c84433fd2c4229e016863d3"
93114
integrity sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==
94115

95-
"@types/json-schema@^7.0.9":
96-
version "7.0.15"
97-
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
98-
integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
99-
100116
"@types/node@*", "@types/node@>=10.0.0":
101117
version "18.14.0"
102118
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.14.0.tgz#94c47b9217bbac49d4a67a967fdcdeed89ebb7d0"
@@ -674,7 +690,7 @@ engine.io@~6.6.0:
674690
engine.io-parser "~5.2.1"
675691
ws "~8.17.1"
676692

677-
enhanced-resolve@^5.17.1:
693+
enhanced-resolve@^5.17.0:
678694
version "5.18.1"
679695
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz#728ab082f8b7b6836de51f1637aab5d3b9568faf"
680696
integrity sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==
@@ -1146,10 +1162,10 @@ [email protected]:
11461162
minimatch "^9.0.3"
11471163
webpack-merge "^4.1.5"
11481164

1149-
[email protected].4:
1150-
version "6.4.4"
1151-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
1152-
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
1165+
[email protected].3:
1166+
version "6.4.3"
1167+
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.3.tgz#763e500f99597218bbb536de1a14acc4ceea7ce8"
1168+
integrity sha512-LuucC/RE92tJ8mlCwqEoRWXP38UMAqpnq98vktmS9SznSoUPPUJQbc91dHcxcunROvfQjdORVA/YFviH+Xci9Q==
11531169
dependencies:
11541170
"@colors/colors" "1.5.0"
11551171
body-parser "^1.19.0"
@@ -1181,13 +1197,6 @@ kind-of@^6.0.2:
11811197
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
11821198
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
11831199

1184-
[email protected]:
1185-
version "2.0.0"
1186-
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.0.0.tgz#b112096b273c1e733e0b86560998235c09a19286"
1187-
integrity sha512-xkVGl60Ygn/zuLkDPx+oHj7jeLR7hCvoNF99nhwXMn8a3ApB4lLiC9pk4ol4NHPjyoCbvQctBqvzUcp8pkqyWw==
1188-
dependencies:
1189-
format-util "^1.0.5"
1190-
11911200
loader-runner@^4.2.0:
11921201
version "4.3.0"
11931202
resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
@@ -1291,10 +1300,10 @@ mkdirp@^0.5.5:
12911300
dependencies:
12921301
minimist "^1.2.6"
12931302

1294-
[email protected].3:
1295-
version "10.7.3"
1296-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.3.tgz#ae32003cabbd52b59aece17846056a68eb4b0752"
1297-
integrity sha512-uQWxAu44wwiACGqjbPYmjo7Lg8sFrS3dQe7PP2FQI+woptP4vZXSMcfMyFL/e1yFEeEpV4RtyTpZROOKmxis+A==
1303+
[email protected].0:
1304+
version "10.7.0"
1305+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.7.0.tgz#9e5cbed8fa9b37537a25bd1f7fb4f6fc45458b9a"
1306+
integrity sha512-v8/rBWr2VO5YkspYINnvu81inSz2y3ODJrhO175/Exzor1RcEZZkizgE2A+w/CAXXoESS8Kys5E62dOHGHzULA==
12981307
dependencies:
12991308
ansi-colors "^4.1.3"
13001309
browser-stdout "^1.3.1"
@@ -1891,11 +1900,12 @@ webpack-sources@^3.2.3:
18911900
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
18921901
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
18931902

1894-
webpack@5.94.0:
1895-
version "5.94.0"
1896-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.94.0.tgz#77a6089c716e7ab90c1c67574a28da518a20970f"
1897-
integrity sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==
1903+
webpack@5.93.0:
1904+
version "5.93.0"
1905+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.93.0.tgz#2e89ec7035579bdfba9760d26c63ac5c3462a5e5"
1906+
integrity sha512-Y0m5oEY1LRuwly578VqluorkXbvXKh7U3rLoQCEO04M97ScRr44afGVkI0FQFsXzysk5OgFAxjZAb9rsGQVihA==
18981907
dependencies:
1908+
"@types/eslint-scope" "^3.7.3"
18991909
"@types/estree" "^1.0.5"
19001910
"@webassemblyjs/ast" "^1.12.1"
19011911
"@webassemblyjs/wasm-edit" "^1.12.1"
@@ -1904,7 +1914,7 @@ [email protected]:
19041914
acorn-import-attributes "^1.9.5"
19051915
browserslist "^4.21.10"
19061916
chrome-trace-event "^1.0.2"
1907-
enhanced-resolve "^5.17.1"
1917+
enhanced-resolve "^5.17.0"
19081918
es-module-lexer "^1.2.1"
19091919
eslint-scope "5.1.1"
19101920
events "^3.2.0"

‎samples/dungeon/timemachine-shakeable/src/main/java/com/squareup/sample/timemachine/shakeable/ShakeableTimeMachineWorkflow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import kotlin.time.ExperimentalTime
2424
* This workflow takes a [PropsFactory] as its props. See that class for more documentation.
2525
*/
2626
@ExperimentalTime
27-
class ShakeableTimeMachineWorkflow<P, O : Any, R : Screen>(
27+
class ShakeableTimeMachineWorkflow<P, O : Any, out R : Screen>(
2828
private val timeMachineWorkflow: TimeMachineWorkflow<P, O, R>,
2929
context: Context
3030
) : StatefulWorkflow<PropsFactory<P>, State, O, ShakeableTimeMachineScreen>() {

‎samples/dungeon/timemachine/src/main/java/com/squareup/sample/timemachine/TimeMachineWorkflow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import kotlin.time.TimeSource
2525
* @param clock The [TimeSource] to use to assign timestamps to recorded values.
2626
*/
2727
@ExperimentalTime
28-
class TimeMachineWorkflow<P, O : Any, R>(
28+
class TimeMachineWorkflow<P, O : Any, out R>(
2929
private val delegateWorkflow: Workflow<P, O, R>,
3030
clock: TimeSource
3131
) : StatelessWorkflow<TimeMachineProps<P>, O, TimeMachineRendering<R>>() {

‎samples/tutorial/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
33
// Top-level build file where you can add configuration options common to all sub-projects/modules.
44
buildscript {
55
ext {
6-
kotlin_version = '2.1.21'
6+
kotlin_version = '2.0.21'
77
workflow_version = "1.12.1-beta04"
88

99
deps = [

‎trace-encoder/dependencies/runtimeClasspath.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ com.squareup.moshi:moshi-adapters:1.15.0
22
com.squareup.moshi:moshi:1.15.0
33
com.squareup.okio:okio-jvm:3.3.0
44
com.squareup.okio:okio:3.3.0
5-
org.jetbrains.kotlin:kotlin-bom:2.1.21
6-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
7-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
8-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
9-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
5+
org.jetbrains.kotlin:kotlin-bom:2.0.21
6+
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
7+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
8+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
9+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
1010
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
1111
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
1212
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3

‎workflow-config/config-android/dependencies/releaseRuntimeClasspath.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
com.squareup.okio:okio-jvm:3.3.0
22
com.squareup.okio:okio:3.3.0
3-
org.jetbrains.kotlin:kotlin-bom:2.1.21
4-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
5-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
6-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
7-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
3+
org.jetbrains.kotlin:kotlin-bom:2.0.21
4+
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
5+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
6+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
7+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
88
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
99
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
1010
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3

‎workflow-config/config-jvm/dependencies/runtimeClasspath.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
com.squareup.okio:okio-jvm:3.3.0
22
com.squareup.okio:okio:3.3.0
3-
org.jetbrains.kotlin:kotlin-bom:2.1.21
4-
org.jetbrains.kotlin:kotlin-stdlib-common:2.1.21
5-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
6-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
7-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
3+
org.jetbrains.kotlin:kotlin-bom:2.0.21
4+
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
5+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
6+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
7+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
88
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
99
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
1010
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3

‎workflow-core/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kotlin {
1111
iosWithSimulatorArm64()
1212
}
1313
if (targets == "kmp" || targets == "jvm") {
14-
jvm { }
14+
jvm { withJava() }
1515
}
1616
if (targets == "kmp" || targets == "js") {
1717
js(IR) { browser() }

‎workflow-core/dependencies/jsRuntimeClasspath.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
com.squareup.okio:okio-js:3.3.0
22
com.squareup.okio:okio:3.3.0
3-
org.jetbrains.kotlin:kotlin-bom:2.1.21
4-
org.jetbrains.kotlin:kotlin-dom-api-compat:2.1.21
5-
org.jetbrains.kotlin:kotlin-stdlib-js:2.1.21
6-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
3+
org.jetbrains.kotlin:kotlin-bom:2.0.21
4+
org.jetbrains.kotlin:kotlin-dom-api-compat:2.0.21
5+
org.jetbrains.kotlin:kotlin-stdlib-js:2.0.21
6+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
77
org.jetbrains.kotlin:kotlinx-atomicfu-runtime:1.8.20
88
org.jetbrains.kotlinx:atomicfu-js:0.21.0
99
org.jetbrains.kotlinx:kotlinx-coroutines-core-js:1.7.3

‎workflow-core/dependencies/jvmRuntimeClasspath.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
com.squareup.okio:okio-jvm:3.3.0
22
com.squareup.okio:okio:3.3.0
3-
org.jetbrains.kotlin:kotlin-bom:2.1.21
4-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.21
5-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.21
6-
org.jetbrains.kotlin:kotlin-stdlib:2.1.21
3+
org.jetbrains.kotlin:kotlin-bom:2.0.21
4+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
5+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
6+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
77
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
88
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
99
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3

‎workflow-core/dependencies/runtimeClasspath.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
com.squareup.okio:okio-jvm:3.3.0
22
com.squareup.okio:okio:3.3.0
3-
org.jetbrains.kotlin:kotlin-bom:1.9.24
4-
org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24
5-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.24
6-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.24
7-
org.jetbrains.kotlin:kotlin-stdlib:1.9.24
3+
org.jetbrains.kotlin:kotlin-bom:2.0.21
4+
org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21
5+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.0.21
6+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.0.21
7+
org.jetbrains.kotlin:kotlin-stdlib:2.0.21
88
org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3
99
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.3
1010
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3

‎workflow-core/src/commonMain/kotlin/com/squareup/workflow1/SessionWorkflow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public abstract class SessionWorkflow<
2323
PropsT,
2424
StateT,
2525
OutputT,
26-
RenderingT
26+
out RenderingT
2727
> : StatefulWorkflow<PropsT, StateT, OutputT, RenderingT>() {
2828

2929
/**

‎workflow-core/src/commonMain/kotlin/com/squareup/workflow1/StatefulWorkflow.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public abstract class StatefulWorkflow<
7272
PropsT,
7373
StateT,
7474
OutputT,
75-
RenderingT
75+
out RenderingT
7676
> : Workflow<PropsT, OutputT, RenderingT>, IdCacheable {
7777

7878
public inner class RenderContext internal constructor(

0 commit comments

Comments
 (0)