From a77f3a629c4a40077e8ce56faeb3108a901bbd87 Mon Sep 17 00:00:00 2001 From: Honza Rychnovsky Date: Fri, 16 Dec 2022 14:11:09 +0100 Subject: [PATCH] [#820] Kotlin 1.7.21 + KSP 1.7.21 * [#820] Kotlin 1.7.21 + KSP 1.7.21 * Re-generate locks after merge * Update Changelog --- CHANGELOG.md | 5 ++++ build-conventions/gradle.lockfile | 44 +++++++++++++++---------------- gradle.properties | 4 +-- 3 files changed, 29 insertions(+), 24 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b08b604b..bcb64dbe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -49,6 +49,11 @@ Change Log encoded Sapling and transparent keys. - `Synchronizer` methods that previously took an `Int` for account index now take an `Account` object - `Synchronizer.sendToAddress()` and `Synchronizer.shieldFunds()` return flows that can now be collected multiple times. Prior versions of the SDK had a bug that could submit transactions multiple times if the flow was collected more than once. +- Updated dependencies: + - Kotlin 1.7.21 + - AndroidX + - etc. +- Updated checkpoints ### Removed - `cash.z.ecc.android.sdk`: diff --git a/build-conventions/gradle.lockfile b/build-conventions/gradle.lockfile index cd454c05..ad37b3ca 100644 --- a/build-conventions/gradle.lockfile +++ b/build-conventions/gradle.lockfile @@ -108,39 +108,39 @@ org.glassfish.jaxb:jaxb-runtime:2.3.2=runtimeClasspath org.glassfish.jaxb:txw2:2.3.2=runtimeClasspath org.jdom:jdom2:2.0.6=runtimeClasspath org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-android-extensions:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-build-common:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-android-extensions:1.7.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-build-common:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-compiler-runner:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-daemon-client:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.7.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.7.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.7.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-native-utils:1.7.20=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-native-utils:1.7.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-project-model:1.7.20=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-project-model:1.7.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.5.31=runtimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath org.jetbrains.kotlin:kotlin-sam-with-receiver:1.7.10=kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-script-runtime:1.7.10=kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-scripting-common:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-common:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.21=runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=runtimeClasspath @@ -150,10 +150,10 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath org.jetbrains.kotlin:kotlin-stdlib:1.5.31=runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-tooling-core:1.7.20=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-tooling-core:1.7.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-util-io:1.7.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-util-klib:1.7.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-util-io:1.7.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-util-klib:1.7.21=runtimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=runtimeClasspath org.jetbrains:annotations:13.0=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath org.json:json:20180813=runtimeClasspath diff --git a/gradle.properties b/gradle.properties index b06e1ad2..aa46c8cc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -82,7 +82,7 @@ FLANK_VERSION=22.10.0 FULLADLE_VERSION=0.17.4 GRADLE_VERSIONS_PLUGIN_VERSION=0.44.0 KTLINT_VERSION=0.47.1 -KSP_VERSION=1.7.20-1.0.6 +KSP_VERSION=1.7.21-1.0.8 PROTOBUF_GRADLE_PLUGIN_VERSION=0.8.19 RUST_GRADLE_PLUGIN_VERSION=0.9.3 @@ -115,7 +115,7 @@ JACOCO_VERSION=0.8.8 JAVAX_ANNOTATION_VERSION=1.3.2 JUNIT_VERSION=5.9.1 KOTLINX_COROUTINES_VERSION=1.6.4 -KOTLIN_VERSION=1.7.20 +KOTLIN_VERSION=1.7.21 MOCKITO_KOTLIN_VERSION=2.2.0 MOCKITO_VERSION=4.9.0 PROTOC_VERSION=3.21.11