Merge pull request #1328 from square/sedwards/add-render-covariance

Kotlin 2.0.21 & Return 'out RenderingT' variance

Author: steve-the-edwards

.npmrc

@@ -0,0 +1 @@
+registry=https://registry.yarnpkg.com

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 {

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

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"

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

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"

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<P, O : Any, R : Screen>(
+class ShakeableTimeMachineWorkflow<P, O : Any, out R : Screen>(
   private val timeMachineWorkflow: TimeMachineWorkflow<P, O, R>,
   context: Context
 ) : StatefulWorkflow<PropsFactory<P>, State, O, ShakeableTimeMachineScreen>() {

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<P, O : Any, R>(
+class TimeMachineWorkflow<P, O : Any, out R>(
   private val delegateWorkflow: Workflow<P, O, R>,
   clock: TimeSource
 ) : StatelessWorkflow<TimeMachineProps<P>, O, TimeMachineRendering<R>>() {

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 = [

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