From ebd176a287a68f704d610be8a8401eb3310140e3 Mon Sep 17 00:00:00 2001 From: Carter Jernigan Date: Thu, 4 May 2023 06:34:41 -0400 Subject: [PATCH] [#1020] Kotlin 1.8.21 --- build-conventions/gradle.lockfile | 46 +++++++++++++++---------------- gradle.properties | 4 +-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/build-conventions/gradle.lockfile b/build-conventions/gradle.lockfile index 0ab07d9d..ad043b2d 100644 --- a/build-conventions/gradle.lockfile +++ b/build-conventions/gradle.lockfile @@ -107,48 +107,48 @@ 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.8.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-android-extensions:1.8.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-compiler-runner:1.8.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-daemon-client:1.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.8.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=kotlinCompilerClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.8.20=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.8.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.20=runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.21=runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.8.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.8.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-native-utils:1.8.20=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-native-utils:1.8.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-project-model:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-project-model:1.8.20=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-project-model:1.8.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-reflect:1.7.10=compileClasspath,kotlinCompilerClasspath,runtimeClasspath 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.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-common:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.21=runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=compileClasspath,kotlinCompilerClasspath,kotlinCompilerPluginClasspathMain,runtimeClasspath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-tooling-core:1.8.20=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-tooling-core:1.8.21=compileClasspath,runtimeClasspath org.jetbrains.kotlin:kotlin-util-io:1.7.10=kotlinCompilerPluginClasspathMain -org.jetbrains.kotlin:kotlin-util-io:1.8.20=compileClasspath,runtimeClasspath -org.jetbrains.kotlin:kotlin-util-klib:1.8.20=runtimeClasspath +org.jetbrains.kotlin:kotlin-util-io:1.8.21=compileClasspath,runtimeClasspath +org.jetbrains.kotlin:kotlin-util-klib:1.8.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 0c3023ea..f4e29b08 100644 --- a/gradle.properties +++ b/gradle.properties @@ -97,7 +97,7 @@ RUST_GRADLE_PLUGIN_VERSION=0.9.3 ANDROIDX_ACTIVITY_VERSION=1.7.0 ANDROIDX_ANNOTATION_VERSION=1.6.0 ANDROIDX_APPCOMPAT_VERSION=1.6.1 -ANDROIDX_COMPOSE_COMPILER_VERSION=1.4.5 +ANDROIDX_COMPOSE_COMPILER_VERSION=1.4.7 ANDROIDX_COMPOSE_MATERIAL3_VERSION=1.1.0-beta02 ANDROIDX_COMPOSE_VERSION=1.4.1 ANDROIDX_COMPOSE_MATERIAL_ICONS_VERSION=1.4.1 @@ -133,7 +133,7 @@ JAVAX_ANNOTATION_VERSION=1.3.2 JUNIT_VERSION=5.9.2 KOTLINX_COROUTINES_VERSION=1.6.4 KOTLINX_DATETIME_VERSION=0.4.0 -KOTLIN_VERSION=1.8.20 +KOTLIN_VERSION=1.8.21 MOCKITO_KOTLIN_VERSION=2.2.0 MOCKITO_VERSION=5.3.0 PROTOC_VERSION=3.22.3