From 463e7516406b4ba7814703616da0e475523db54c Mon Sep 17 00:00:00 2001 From: Reid Baker Date: Tue, 11 Mar 2025 13:00:17 -0400 Subject: [PATCH] Convert AppLinkSettings to kotlin (#164391) Fixes #162107 Commands that were helpful when working on this pr. `dart dev/tools/bin/generate_gradle_lockfiles.dart --no-gradle-generation` from flutter/flutter root. `./gradlew test` from packages/flutter_tools/gradle. `git add -- ":*.lockfile"` for adding only lockfile changes. `../../bin/cache/dart-sdk/bin/dart bin/test_runner.dart test -t android_java11_dependency_smoke_tests` from dev/devicelab `ktlint --editorconfig=dev/bots/test/analyze-test-input/.editorconfig --baseline=dev/bots/test/analyze-test-input/ktlint-baseline.xml packages/flutter_tools/gradle/src/ --format` formatting kotlin code. Need ktlint 1.5 ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. --- .../android/buildscript-gradle.lockfile | 5 + .../android/project-app.lockfile | 17 +- .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/project-app.lockfile | 17 +- .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../channels/android/project-app.lockfile | 17 +- .../android/buildscript-gradle.lockfile | 154 ------------------ .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/project-app.lockfile | 17 +- .../android/buildscript-gradle.lockfile | 5 + .../spell_check/android/project-app.lockfile | 17 +- .../ui/android/buildscript-gradle.lockfile | 5 + .../ui/android/project-app.lockfile | 17 +- .../android/buildscript-gradle.lockfile | 5 + dev/manual_tests/android/project-app.lockfile | 17 +- .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../android/buildscript-gradle.lockfile | 5 + .../flutter_tools/gradle/build.gradle.kts | 13 +- .../gradle/src/main/groovy/flutter.groovy | 17 +- .../gradle/src/main/kotlin/AppLinkSettings.kt | 39 +++++ .../gradle/src/main/kotlin/Deeplink.kt | 14 +- .../src/main/kotlin/IntentFilterCheck.kt | 12 ++ .../src/test/kotlin/AppLinkSettingsTest.kt | 49 ++++++ .../gradle/src/test/kotlin/DeeplinkTest.kt | 29 +++- .../src/test/kotlin/IntentFilterCheckTest.kt | 28 ++++ ...gradle_outputs_app_link_settings_test.dart | 1 + .../android/buildscript-gradle.lockfile | 5 + 40 files changed, 384 insertions(+), 206 deletions(-) delete mode 100644 dev/integration_tests/display_cutout_rotation/android/buildscript-gradle.lockfile create mode 100644 packages/flutter_tools/gradle/src/main/kotlin/AppLinkSettings.kt create mode 100644 packages/flutter_tools/gradle/src/test/kotlin/AppLinkSettingsTest.kt create mode 100644 packages/flutter_tools/gradle/src/test/kotlin/IntentFilterCheckTest.kt diff --git a/dev/a11y_assessments/android/buildscript-gradle.lockfile b/dev/a11y_assessments/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/a11y_assessments/android/buildscript-gradle.lockfile +++ b/dev/a11y_assessments/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/a11y_assessments/android/project-app.lockfile b/dev/a11y_assessments/android/project-app.lockfile index 2ef2994f05..1ff4102890 100644 --- a/dev/a11y_assessments/android/project-app.lockfile +++ b/dev/a11y_assessments/android/project-app.lockfile @@ -110,12 +110,20 @@ org.jacoco:org.jacoco.agent:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.ant:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.core:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.report:0.8.7=androidJacocoAnt -org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-build-common:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.10=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle @@ -127,16 +135,17 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=debugAndroidTestCompileClasspath, org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlin:kotlin-stdlib:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:atomicfu:0.20.2=debugApiDependenciesMetadata,debugImplementationDependenciesMetadata,profileApiDependenciesMetadata,profileImplementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,debugApiDependenciesMetadata,debugImplementationDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileApiDependenciesMetadata,profileImplementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata +org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,debugApiDependenciesMetadata,debugImplementationDependenciesMetadata,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,profileApiDependenciesMetadata,profileImplementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains:annotations:23.0.0=_internal-unified-test-platform-android-device-provider-ddmlib,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.ow2.asm:asm-analysis:9.1=androidJacocoAnt org.ow2.asm:asm-commons:9.1=androidJacocoAnt diff --git a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile b/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile b/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile b/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile b/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile b/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/android_semantics_testing/android/project-app.lockfile b/dev/integration_tests/android_semantics_testing/android/project-app.lockfile index a72eb8f62d..a85c5d3297 100644 --- a/dev/integration_tests/android_semantics_testing/android/project-app.lockfile +++ b/dev/integration_tests/android_semantics_testing/android/project-app.lockfile @@ -182,13 +182,21 @@ org.jacoco:org.jacoco.agent:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.ant:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.core:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.report:0.8.7=androidJacocoAnt -org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-build-common:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.10=kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath @@ -204,16 +212,17 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=_internal-unified-test-platform-a org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath org.jetbrains.kotlin:kotlin-stdlib:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.trove4j:trove4j:20160824=lintClassPath -org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath +org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath org.jetbrains:annotations:23.0.0=_internal-unified-test-platform-android-device-provider-ddmlib,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jvnet.staxex:stax-ex:1.8=lintClassPath org.ow2.asm:asm-analysis:7.0=lintClassPath diff --git a/dev/integration_tests/android_views/android/buildscript-gradle.lockfile b/dev/integration_tests/android_views/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/android_views/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/android_views/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/channels/android/buildscript-gradle.lockfile b/dev/integration_tests/channels/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/channels/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/channels/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/channels/android/project-app.lockfile b/dev/integration_tests/channels/android/project-app.lockfile index 0d8884722a..7e0f56a2c7 100644 --- a/dev/integration_tests/channels/android/project-app.lockfile +++ b/dev/integration_tests/channels/android/project-app.lockfile @@ -127,12 +127,20 @@ org.jacoco:org.jacoco.agent:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.ant:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.core:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.report:0.8.7=androidJacocoAnt -org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-build-common:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.10=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle @@ -144,16 +152,17 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=debugAndroidTestCompileClasspath, org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlin:kotlin-stdlib:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:atomicfu:0.20.2=releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata +org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains:annotations:23.0.0=_internal-unified-test-platform-android-device-provider-ddmlib,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.ow2.asm:asm-analysis:9.1=androidJacocoAnt org.ow2.asm:asm-commons:9.1=androidJacocoAnt diff --git a/dev/integration_tests/display_cutout_rotation/android/buildscript-gradle.lockfile b/dev/integration_tests/display_cutout_rotation/android/buildscript-gradle.lockfile deleted file mode 100644 index 90b6772a6b..0000000000 --- a/dev/integration_tests/display_cutout_rotation/android/buildscript-gradle.lockfile +++ /dev/null @@ -1,154 +0,0 @@ -# This is a Gradle generated file for dependency locking. -# Manual edits can break the build and are not advised. -# This file is expected to be part of source control. -androidx.databinding:databinding-common:8.7.0=classpath -androidx.databinding:databinding-compiler-common:8.7.0=classpath -com.android.application:com.android.application.gradle.plugin:8.7.0=classpath -com.android.databinding:baseLibrary:8.7.0=classpath -com.android.tools.analytics-library:crash:31.7.0=classpath -com.android.tools.analytics-library:protos:31.7.0=classpath -com.android.tools.analytics-library:shared:31.7.0=classpath -com.android.tools.analytics-library:tracker:31.7.0=classpath -com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath -com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:8.7.0-12006047=classpath -com.android.tools.build:aaptcompiler:8.7.0=classpath -com.android.tools.build:apksig:8.7.0=classpath -com.android.tools.build:apkzlib:8.7.0=classpath -com.android.tools.build:builder-model:8.7.0=classpath -com.android.tools.build:builder-test-api:8.7.0=classpath -com.android.tools.build:builder:8.7.0=classpath -com.android.tools.build:bundletool:1.17.1=classpath -com.android.tools.build:gradle-api:8.7.0=classpath -com.android.tools.build:gradle-settings-api:8.7.0=classpath -com.android.tools.build:gradle:8.7.0=classpath -com.android.tools.build:manifest-merger:31.7.0=classpath -com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:31.7.0=classpath -com.android.tools.layoutlib:layoutlib-api:31.7.0=classpath -com.android.tools.lint:lint-model:31.7.0=classpath -com.android.tools.lint:lint-typedef-remover:31.7.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:31.7.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:31.7.0=classpath -com.android.tools.utp:android-device-provider-profile-proto:31.7.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.7.0=classpath -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.7.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.7.0=classpath -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.7.0=classpath -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.7.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.7.0=classpath -com.android.tools:annotations:31.7.0=classpath -com.android.tools:common:31.7.0=classpath -com.android.tools:dvlib:31.7.0=classpath -com.android.tools:repository:31.7.0=classpath -com.android.tools:sdk-common:31.7.0=classpath -com.android.tools:sdklib:31.7.0=classpath -com.android:signflinger:8.7.0=classpath -com.android:zipflinger:8.7.0=classpath -com.google.android:annotations:4.1.1.4=classpath -com.google.api.grpc:proto-google-common-protos:2.17.0=classpath -com.google.auto.value:auto-value-annotations:1.6.2=classpath -com.google.code.findbugs:jsr305:3.0.2=classpath -com.google.code.gson:gson:2.10.1=classpath -com.google.crypto.tink:tink:1.7.0=classpath -com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.18.0=classpath -com.google.flatbuffers:flatbuffers-java:1.12.0=classpath -com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:32.0.1-jre=classpath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath -com.google.j2objc:j2objc-annotations:2.8=classpath -com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.22.3=classpath -com.google.protobuf:protobuf-java:3.22.3=classpath -com.google.testing.platform:core-proto:0.0.9-alpha02=classpath -com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath -com.squareup:javapoet:1.10.0=classpath -com.squareup:javawriter:2.5.0=classpath -com.sun.activation:javax.activation:1.2.0=classpath -com.sun.istack:istack-commons-runtime:3.0.8=classpath -com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath -commons-codec:commons-codec:1.11=classpath -commons-io:commons-io:2.13.0=classpath -commons-logging:commons-logging:1.2=classpath -io.grpc:grpc-api:1.57.0=classpath -io.grpc:grpc-context:1.57.0=classpath -io.grpc:grpc-core:1.57.0=classpath -io.grpc:grpc-netty:1.57.0=classpath -io.grpc:grpc-protobuf-lite:1.57.0=classpath -io.grpc:grpc-protobuf:1.57.0=classpath -io.grpc:grpc-stub:1.57.0=classpath -io.netty:netty-buffer:4.1.93.Final=classpath -io.netty:netty-codec-http2:4.1.93.Final=classpath -io.netty:netty-codec-http:4.1.93.Final=classpath -io.netty:netty-codec-socks:4.1.93.Final=classpath -io.netty:netty-codec:4.1.93.Final=classpath -io.netty:netty-common:4.1.93.Final=classpath -io.netty:netty-handler-proxy:4.1.93.Final=classpath -io.netty:netty-handler:4.1.93.Final=classpath -io.netty:netty-resolver:4.1.93.Final=classpath -io.netty:netty-transport-native-unix-common:4.1.93.Final=classpath -io.netty:netty-transport:4.1.93.Final=classpath -io.perfmark:perfmark-api:0.26.0=classpath -jakarta.activation:jakarta.activation-api:1.2.1=classpath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath -javax.annotation:javax.annotation-api:1.3.2=classpath -javax.inject:javax.inject:1=classpath -net.java.dev.jna:jna-platform:5.6.0=classpath -net.java.dev.jna:jna:5.6.0=classpath -net.sf.jopt-simple:jopt-simple:4.9=classpath -net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.21=classpath -org.apache.httpcomponents:httpclient:4.5.14=classpath -org.apache.httpcomponents:httpcore:4.4.16=classpath -org.apache.httpcomponents:httpmime:4.5.6=classpath -org.bitbucket.b_c:jose4j:0.9.5=classpath -org.bouncycastle:bcpkix-jdk18on:1.77=classpath -org.bouncycastle:bcprov-jdk18on:1.77=classpath -org.bouncycastle:bcutil-jdk18on:1.77=classpath -org.checkerframework:checker-qual:3.33.0=classpath -org.codehaus.mojo:animal-sniffer-annotations:1.23=classpath -org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath -org.glassfish.jaxb:txw2:2.3.2=classpath -org.jdom:jdom2:2.0.6=classpath -org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath -org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.8.22=classpath -org.jetbrains.kotlin:kotlin-android-extensions:1.8.22=classpath -org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.8.22=classpath -org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.22=classpath -org.jetbrains.kotlin:kotlin-compiler-runner:1.8.22=classpath -org.jetbrains.kotlin:kotlin-daemon-client:1.8.22=classpath -org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.22=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.8.22=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.8.22=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.8.22=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.8.22=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.8.22=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22=classpath -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.8.22=classpath -org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.8.22=classpath -org.jetbrains.kotlin:kotlin-native-utils:1.8.22=classpath -org.jetbrains.kotlin:kotlin-project-model:1.8.22=classpath -org.jetbrains.kotlin:kotlin-reflect:1.9.24=classpath -org.jetbrains.kotlin:kotlin-scripting-common:1.8.22=classpath -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.22=classpath -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.22=classpath -org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.22=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.9.24=classpath -org.jetbrains.kotlin:kotlin-tooling-core:1.8.22=classpath -org.jetbrains.kotlin:kotlin-util-io:1.8.22=classpath -org.jetbrains.kotlin:kotlin-util-klib:1.8.22=classpath -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath -org.jetbrains:annotations:13.0=classpath -org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.6=classpath -org.ow2.asm:asm-commons:9.6=classpath -org.ow2.asm:asm-tree:9.6=classpath -org.ow2.asm:asm-util:9.6=classpath -org.ow2.asm:asm:9.6=classpath -org.slf4j:slf4j-api:1.7.30=classpath -org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath -empty= diff --git a/dev/integration_tests/flavors/android/buildscript-gradle.lockfile b/dev/integration_tests/flavors/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/flavors/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/flavors/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile b/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile b/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/platform_interaction/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile b/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/release_smoke_test/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/release_smoke_test/android/project-app.lockfile b/dev/integration_tests/release_smoke_test/android/project-app.lockfile index 6d4c672dc7..391a5f39a0 100644 --- a/dev/integration_tests/release_smoke_test/android/project-app.lockfile +++ b/dev/integration_tests/release_smoke_test/android/project-app.lockfile @@ -185,13 +185,21 @@ org.jacoco:org.jacoco.agent:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.ant:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.core:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.report:0.8.7=androidJacocoAnt -org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-build-common:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.10=kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath @@ -207,17 +215,18 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=_internal-unified-test-platform-a org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath org.jetbrains.kotlin:kotlin-stdlib:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:atomicfu:0.20.2=releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.trove4j:trove4j:20160824=lintClassPath -org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata +org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains:annotations:23.0.0=_internal-unified-test-platform-android-device-provider-ddmlib,debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jvnet.staxex:stax-ex:1.8=lintClassPath org.ow2.asm:asm-analysis:7.0=lintClassPath diff --git a/dev/integration_tests/spell_check/android/buildscript-gradle.lockfile b/dev/integration_tests/spell_check/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/spell_check/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/spell_check/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/spell_check/android/project-app.lockfile b/dev/integration_tests/spell_check/android/project-app.lockfile index 1dfab3bef7..93bb93e999 100644 --- a/dev/integration_tests/spell_check/android/project-app.lockfile +++ b/dev/integration_tests/spell_check/android/project-app.lockfile @@ -127,12 +127,20 @@ org.jacoco:org.jacoco.agent:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.ant:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.core:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.report:0.8.7=androidJacocoAnt -org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-build-common:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.10=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=implementationDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath @@ -145,16 +153,17 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=_internal-unified-test-platform-a org.jetbrains.kotlin:kotlin-stdlib:1.7.10=implementationDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:atomicfu:0.20.2=releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata +org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains:annotations:23.0.0=_internal-unified-test-platform-android-device-provider-ddmlib,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.ow2.asm:asm-analysis:9.1=androidJacocoAnt org.ow2.asm:asm-commons:9.1=androidJacocoAnt diff --git a/dev/integration_tests/ui/android/buildscript-gradle.lockfile b/dev/integration_tests/ui/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/integration_tests/ui/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/ui/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/integration_tests/ui/android/project-app.lockfile b/dev/integration_tests/ui/android/project-app.lockfile index 40f5699a73..79dcac63e0 100644 --- a/dev/integration_tests/ui/android/project-app.lockfile +++ b/dev/integration_tests/ui/android/project-app.lockfile @@ -126,12 +126,20 @@ org.jacoco:org.jacoco.agent:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.ant:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.core:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.report:0.8.7=androidJacocoAnt -org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-build-common:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.10=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.22=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle @@ -143,15 +151,16 @@ org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20=debugAndroidTestCompileClasspath, org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlin:kotlin-stdlib:1.8.10=apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,apiDependenciesMetadata,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains:annotations:23.0.0=_internal-unified-test-platform-android-device-provider-ddmlib,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.ow2.asm:asm-analysis:9.1=androidJacocoAnt org.ow2.asm:asm-commons:9.1=androidJacocoAnt diff --git a/dev/manual_tests/android/buildscript-gradle.lockfile b/dev/manual_tests/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/dev/manual_tests/android/buildscript-gradle.lockfile +++ b/dev/manual_tests/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/dev/manual_tests/android/project-app.lockfile b/dev/manual_tests/android/project-app.lockfile index c474395b35..0305482bdb 100644 --- a/dev/manual_tests/android/project-app.lockfile +++ b/dev/manual_tests/android/project-app.lockfile @@ -170,13 +170,21 @@ org.jacoco:org.jacoco.agent:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.ant:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.core:0.8.7=androidJacocoAnt org.jacoco:org.jacoco.report:0.8.7=androidJacocoAnt -org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-build-common:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-compiler-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-daemon-embeddable:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:1.8.10=kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-script-runtime:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-script-runtime:1.9.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=implementationDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib-common:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath @@ -193,17 +201,18 @@ org.jetbrains.kotlin:kotlin-stdlib:1.3.72=lintClassPath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=implementationDependenciesMetadata org.jetbrains.kotlin:kotlin-stdlib:1.8.10=kotlinCompilerClasspath,kotlinKlibCommonizerClasspath org.jetbrains.kotlin:kotlin-stdlib:1.8.22=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle +org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:atomicfu:0.20.2=debugApiDependenciesMetadata,debugImplementationDependenciesMetadata,profileApiDependenciesMetadata,profileImplementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.1=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=kotlinBuildToolsApiClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1=debugAndroidTestCompileClasspath,debugApiDependenciesMetadata,debugCompileClasspath,debugImplementationDependenciesMetadata,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileApiDependenciesMetadata,profileCompileClasspath,profileImplementationDependenciesMetadata,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseApiDependenciesMetadata,releaseCompileClasspath,releaseImplementationDependenciesMetadata,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.trove4j:trove4j:20160824=lintClassPath -org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,debugApiDependenciesMetadata,debugImplementationDependenciesMetadata,implementationDependenciesMetadata,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileApiDependenciesMetadata,profileImplementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata +org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-apk-installer,_internal-unified-test-platform-android-test-plugin-host-coverage,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-android-test-plugin-result-listener-gradle,debugApiDependenciesMetadata,debugImplementationDependenciesMetadata,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinKlibCommonizerClasspath,lintClassPath,profileApiDependenciesMetadata,profileImplementationDependenciesMetadata,releaseApiDependenciesMetadata,releaseImplementationDependenciesMetadata org.jetbrains:annotations:23.0.0=_internal-unified-test-platform-android-device-provider-ddmlib,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jvnet.staxex:stax-ex:1.8=lintClassPath org.ow2.asm:asm-analysis:7.0=lintClassPath diff --git a/examples/flutter_view/android/buildscript-gradle.lockfile b/examples/flutter_view/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/examples/flutter_view/android/buildscript-gradle.lockfile +++ b/examples/flutter_view/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/examples/hello_world/android/buildscript-gradle.lockfile b/examples/hello_world/android/buildscript-gradle.lockfile index 90b6772a6b..6412c16e86 100644 --- a/examples/hello_world/android/buildscript-gradle.lockfile +++ b/examples/hello_world/android/buildscript-gradle.lockfile @@ -135,6 +135,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.22=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.22=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.22=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.22=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.24=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.24=classpath @@ -142,6 +143,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.22=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.22=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.22=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:13.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/examples/image_list/android/buildscript-gradle.lockfile b/examples/image_list/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/examples/image_list/android/buildscript-gradle.lockfile +++ b/examples/image_list/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/examples/layers/android/buildscript-gradle.lockfile b/examples/layers/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/examples/layers/android/buildscript-gradle.lockfile +++ b/examples/layers/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/examples/platform_channel/android/buildscript-gradle.lockfile b/examples/platform_channel/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/examples/platform_channel/android/buildscript-gradle.lockfile +++ b/examples/platform_channel/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/examples/platform_view/android/buildscript-gradle.lockfile b/examples/platform_view/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/examples/platform_view/android/buildscript-gradle.lockfile +++ b/examples/platform_view/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath diff --git a/packages/flutter_tools/gradle/build.gradle.kts b/packages/flutter_tools/gradle/build.gradle.kts index 554500d51f..9c658a3677 100644 --- a/packages/flutter_tools/gradle/build.gradle.kts +++ b/packages/flutter_tools/gradle/build.gradle.kts @@ -51,16 +51,23 @@ tasks.withType { tasks.test { useJUnitPlatform() } - -kotlin { +// https://stackoverflow.com/questions/55456176/unresolved-reference-compilekotlin-in-build-gradle-kts +tasks.withType { compilerOptions { jvmTarget.set(JvmTarget.JVM_11) } } dependencies { + // Versions available https://mvnrepository.com/artifact/androidx.annotation/annotation-jvm. + // Version release notes https://developer.android.com/jetpack/androidx/releases/annotation compileOnly("androidx.annotation:annotation-jvm:1.9.1") - implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10") + implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0") + // Update to 1.8.0 when min kotlin is 2.1 + // https://github.com/Kotlin/kotlinx.serialization/releases for kotlin version compatibility. + // All kotlinx implementation dependencies must work with the oldest kotlin supported versions. + // Defined in packages/flutter_tools/gradle/src/main/kotlin/DependencyVersionChecker.kt + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0") // When bumping, also update: // * ndkVersion in FlutterExtension in packages/flutter_tools/gradle/src/main/groovy/flutter.groovy // * AGP version in the buildscript block in packages/flutter_tools/gradle/src/main/kotlin_scripts/dependency_version_checker.gradle.kts diff --git a/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy b/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy index 9607e2e30a..834a73a385 100644 --- a/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy +++ b/packages/flutter_tools/gradle/src/main/groovy/flutter.groovy @@ -4,12 +4,12 @@ // found in the LICENSE file. import com.android.build.OutputFile +import com.flutter.gradle.AppLinkSettings import com.flutter.gradle.BaseApplicationNameHandler import com.flutter.gradle.Deeplink import com.flutter.gradle.DependencyVersionChecker import com.flutter.gradle.IntentFilterCheck import com.flutter.gradle.VersionUtils -import groovy.json.JsonGenerator import groovy.xml.QName import java.nio.file.Paths import org.apache.tools.ant.taskdefs.condition.Os @@ -479,9 +479,7 @@ class FlutterPlugin implements Plugin { dependsOn processResources.name } doLast { - AppLinkSettings appLinkSettings = new AppLinkSettings() - appLinkSettings.applicationId = variant.applicationId - appLinkSettings.deeplinks = [] as Set + AppLinkSettings appLinkSettings = new AppLinkSettings(variant.applicationId) variant.outputs.configureEach { output -> Object processResources = output.hasProperty(propProcessResourcesProvider) ? output.processResourcesProvider.get() : output.processResources @@ -557,8 +555,7 @@ class FlutterPlugin implements Plugin { } } } - JsonGenerator generator = new JsonGenerator.Options().build() - new File(project.getProperty("outputPath")).write(generator.toJson(appLinkSettings)) + new File(project.getProperty("outputPath")).write(appLinkSettings.toJson().toString()) } } } @@ -1529,14 +1526,6 @@ class FlutterPlugin implements Plugin { } -class AppLinkSettings { - - String applicationId - Set deeplinks - boolean deeplinkingFlagEnabled - -} - abstract class BaseFlutterTask extends DefaultTask { @Internal diff --git a/packages/flutter_tools/gradle/src/main/kotlin/AppLinkSettings.kt b/packages/flutter_tools/gradle/src/main/kotlin/AppLinkSettings.kt new file mode 100644 index 0000000000..3cbb0acafb --- /dev/null +++ b/packages/flutter_tools/gradle/src/main/kotlin/AppLinkSettings.kt @@ -0,0 +1,39 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. + +package com.flutter.gradle + +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.buildJsonObject +import kotlinx.serialization.json.put +import kotlinx.serialization.json.putJsonArray + +/* + * See https://developer.android.com/training/app-links/ for more information about app link. + */ +data class AppLinkSettings( + val applicationId: String? +) { + var deeplinkingFlagEnabled = false + val deeplinks = mutableSetOf() + + // An example json: + // { + // applicationId: "com.example.app", + // deeplinks: [ + // {"scheme":"http", "host":"example.com", "path":".*"}, + // {"scheme":"https","host":"example.com","path":".*"} + // ] + // } + fun toJson(): JsonObject = + buildJsonObject { + put("applicationId", applicationId) + put("deeplinkingFlagEnabled", deeplinkingFlagEnabled) + putJsonArray("deeplinks") { + for (deeplink: Deeplink in deeplinks) { + add(deeplink.toJson()) + } + } + } +} diff --git a/packages/flutter_tools/gradle/src/main/kotlin/Deeplink.kt b/packages/flutter_tools/gradle/src/main/kotlin/Deeplink.kt index 7ac3be7a46..ead9c47d2a 100644 --- a/packages/flutter_tools/gradle/src/main/kotlin/Deeplink.kt +++ b/packages/flutter_tools/gradle/src/main/kotlin/Deeplink.kt @@ -4,12 +4,16 @@ package com.flutter.gradle +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.buildJsonObject +import kotlinx.serialization.json.put + // TODO(gmackall): Identify which of these can be val instead of var. class Deeplink( var scheme: String?, var host: String?, var path: String?, - var intentFilterCheck: IntentFilterCheck? + var intentFilterCheck: IntentFilterCheck ) { // TODO(gmackall): This behavior was kept identical to the original Groovy behavior as part of // the Groovy->Kotlin conversion, but should be changed once the conversion is complete. @@ -27,4 +31,12 @@ class Deeplink( } override fun hashCode(): Int = scheme.hashCode() + host.hashCode() + path.hashCode() + + fun toJson(): JsonObject = + buildJsonObject { + put("scheme", scheme) + put("host", host) + put("path", path) + put("intentFilterCheck", intentFilterCheck.toJson()) + } } diff --git a/packages/flutter_tools/gradle/src/main/kotlin/IntentFilterCheck.kt b/packages/flutter_tools/gradle/src/main/kotlin/IntentFilterCheck.kt index 2d7a810dd7..90b3ebe955 100644 --- a/packages/flutter_tools/gradle/src/main/kotlin/IntentFilterCheck.kt +++ b/packages/flutter_tools/gradle/src/main/kotlin/IntentFilterCheck.kt @@ -4,10 +4,22 @@ package com.flutter.gradle +import kotlinx.serialization.json.JsonObject +import kotlinx.serialization.json.buildJsonObject +import kotlinx.serialization.json.put + class IntentFilterCheck { // TODO(gmackall): Identify which of these can be val instead of var. var hasAutoVerify = false var hasActionView = false var hasDefaultCategory = false var hasBrowsableCategory = false + + fun toJson(): JsonObject = + buildJsonObject { + put("hasAutoVerify", hasAutoVerify) + put("hasActionView", hasActionView) + put("hasDefaultCategory", hasDefaultCategory) + put("hasBrowsableCategory", hasBrowsableCategory) + } } diff --git a/packages/flutter_tools/gradle/src/test/kotlin/AppLinkSettingsTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/AppLinkSettingsTest.kt new file mode 100644 index 0000000000..030b0e4a85 --- /dev/null +++ b/packages/flutter_tools/gradle/src/test/kotlin/AppLinkSettingsTest.kt @@ -0,0 +1,49 @@ +// Copyright 2014 The Flutter Authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. +package com.flutter.gradle + +import kotlin.test.Test +import kotlin.test.assertContains +import kotlin.test.assertFalse +import kotlin.test.assertTrue + +class AppLinkSettingsTest { + @Test + fun canCreateThenEditDeeplinks() { + val deeplink1 = Deeplink("scheme1", "host1", "path1", IntentFilterCheck()) + val deeplink2 = Deeplink("scheme2", "host2", "path2", IntentFilterCheck()) + val appLinkSettings = AppLinkSettings(applicationId = "testApplicationId") + + appLinkSettings.deeplinks.add(deeplink1) + assert(appLinkSettings.deeplinks.contains(deeplink1)) + // Check default value. + assertFalse(appLinkSettings.deeplinkingFlagEnabled) + // Can change the default value. + appLinkSettings.deeplinkingFlagEnabled = true + + appLinkSettings.deeplinks.add(deeplink2) + + assert(appLinkSettings.deeplinks.contains(deeplink1)) + assert(appLinkSettings.deeplinks.contains(deeplink2)) + } + + @Test + fun canCreateAppLinkSettingsJson() { + val deeplink1 = Deeplink("scheme1", "host1", "path1", IntentFilterCheck()) + val deeplink2 = Deeplink("scheme2", "host2", "path2", IntentFilterCheck()) + val appLinkSettings = AppLinkSettings(applicationId = "testApplicationId") + appLinkSettings.deeplinkingFlagEnabled = true + appLinkSettings.deeplinks.addAll(listOf(deeplink1, deeplink2)) + + val settingsJson = appLinkSettings.toJson() + + // Keys are not a reference because the key values are accessed + // across the gradle/dart boundery. + assertTrue(settingsJson.containsKey("applicationId")) + assertTrue(settingsJson.containsKey("deeplinkingFlagEnabled")) + assertTrue(settingsJson.containsKey("deeplinks")) + assertContains(settingsJson.toString(), deeplink1.toJson().toString()) + assertContains(settingsJson.toString(), deeplink2.toJson().toString()) + } +} diff --git a/packages/flutter_tools/gradle/src/test/kotlin/DeeplinkTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/DeeplinkTest.kt index 28c747d671..3310814489 100644 --- a/packages/flutter_tools/gradle/src/test/kotlin/DeeplinkTest.kt +++ b/packages/flutter_tools/gradle/src/test/kotlin/DeeplinkTest.kt @@ -2,29 +2,30 @@ package com.flutter.gradle import org.gradle.internal.impldep.org.junit.Assert.assertThrows import kotlin.test.Test +import kotlin.test.assertContains import kotlin.test.assertFalse import kotlin.test.assertTrue class DeeplinkTest { @Test fun `equals should return true for equal objects`() { - val deeplink1 = Deeplink("scheme1", "host1", "path1", null) - val deeplink2 = Deeplink("scheme1", "host1", "path1", null) + val deeplink1 = Deeplink("scheme1", "host1", "path1", IntentFilterCheck()) + val deeplink2 = Deeplink("scheme1", "host1", "path1", IntentFilterCheck()) assertTrue { deeplink1 == deeplink2 } } @Test fun `equals should return false for unequal objects`() { - val deeplink1 = Deeplink("scheme1", "host1", "path1", null) - val deeplink2 = Deeplink("scheme2", "host2", "path2", null) + val deeplink1 = Deeplink("scheme1", "host1", "path1", IntentFilterCheck()) + val deeplink2 = Deeplink("scheme2", "host2", "path2", IntentFilterCheck()) assertFalse { deeplink1 == deeplink2 } } @Test fun `equals should return false for other of different type`() { - val deeplink1 = Deeplink("scheme1", "host1", "path1", null) + val deeplink1 = Deeplink("scheme1", "host1", "path1", IntentFilterCheck()) val notADeeplink = 5 assertFalse { deeplink1.equals(notADeeplink) } @@ -33,9 +34,25 @@ class DeeplinkTest { @Suppress("UnusedEquals") @Test fun `equals should throw NullPointerException for null other`() { - val deeplink1 = Deeplink("scheme1", "host1", "path1", null) + val deeplink1 = Deeplink("scheme1", "host1", "path1", IntentFilterCheck()) val deeplink2 = null assertThrows(NullPointerException::class.java, { deeplink1.equals(deeplink2) }) } + + @Test + fun canCreateDeeplinkJsonWithIntentFilter() { + val intentFilterCheck = IntentFilterCheck() + intentFilterCheck.hasActionView = true + intentFilterCheck.hasDefaultCategory = true + val deeplink = Deeplink("scheme1", "host1", "path1", intentFilterCheck) + val linkJson = deeplink.toJson() + // Keys are not a reference because the key values are accessed + // across the gradle/dart boundery. + assertTrue(linkJson.containsKey("scheme")) + assertTrue(linkJson.containsKey("host")) + assertTrue(linkJson.containsKey("path")) + assertTrue(linkJson.containsKey("intentFilterCheck")) + assertContains(linkJson.toString(), intentFilterCheck.toJson().toString()) + } } diff --git a/packages/flutter_tools/gradle/src/test/kotlin/IntentFilterCheckTest.kt b/packages/flutter_tools/gradle/src/test/kotlin/IntentFilterCheckTest.kt new file mode 100644 index 0000000000..836c6197d8 --- /dev/null +++ b/packages/flutter_tools/gradle/src/test/kotlin/IntentFilterCheckTest.kt @@ -0,0 +1,28 @@ +package com.flutter.gradle + +import kotlin.test.Test +import kotlin.test.assertEquals +import kotlin.test.assertTrue + +class IntentFilterCheckTest { + @Test + fun canCreateIntentFilterJson() { + val intentFilterCheck = IntentFilterCheck() + intentFilterCheck.hasActionView = true + intentFilterCheck.hasDefaultCategory = true + + val intentJson = intentFilterCheck.toJson() + + // Keys are not a reference because the key values are accessed + // across the gradle/dart boundery. + assertTrue(intentJson.containsKey("hasAutoVerify")) + assertTrue(intentJson.containsKey("hasActionView")) + assertTrue(intentJson.containsKey("hasDefaultCategory")) + assertTrue(intentJson.containsKey("hasBrowsableCategory")) + + assertEquals("false", intentJson.get(key = "hasAutoVerify").toString()) + assertEquals("true", intentJson.get(key = "hasActionView").toString()) + assertEquals("true", intentJson.get(key = "hasDefaultCategory").toString()) + assertEquals("false", intentJson.get(key = "hasBrowsableCategory").toString()) + } +} diff --git a/packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart b/packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart index d5f3444a03..a65b6ade0c 100644 --- a/packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart +++ b/packages/flutter_tools/test/integration.shard/android_gradle_outputs_app_link_settings_test.dart @@ -226,6 +226,7 @@ void main() { tempDir.path, '--project-name=testapp', ], workingDirectory: tempDir.path); + printOnFailure('Created testapp in $tempDir'); expect(result, const ProcessResultMatcher()); // Adds intent filters for app links final String androidManifestPath = fileSystem.path.join( diff --git a/packages/integration_test/example/android/buildscript-gradle.lockfile b/packages/integration_test/example/android/buildscript-gradle.lockfile index 291d301d24..545abc59e9 100644 --- a/packages/integration_test/example/android/buildscript-gradle.lockfile +++ b/packages/integration_test/example/android/buildscript-gradle.lockfile @@ -134,6 +134,7 @@ org.jetbrains.kotlin:kotlin-scripting-common:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.8.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.8.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20=classpath org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath @@ -141,6 +142,10 @@ org.jetbrains.kotlin:kotlin-tooling-core:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.8.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.8.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.4.0=classpath +org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0=classpath org.jetbrains:annotations:23.0.0=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath org.ow2.asm:asm-analysis:9.6=classpath