diff --git a/dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart b/dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart index 81287eefb8a..cf7bed506f2 100644 --- a/dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart +++ b/dev/devicelab/bin/tasks/android_java17_dependency_smoke_tests.dart @@ -26,7 +26,7 @@ List versionTuples = [ VersionTuple(agpVersion: '8.4.0', gradleVersion: '8.6', kotlinVersion: '1.8.22'), VersionTuple(agpVersion: '8.6.0', gradleVersion: '8.7', kotlinVersion: '1.8.22'), VersionTuple(agpVersion: '8.7.0', gradleVersion: '8.9', kotlinVersion: '2.1.0'), - VersionTuple(agpVersion: '8.11.0', gradleVersion: '8.13', kotlinVersion: '2.2.0'), + VersionTuple(agpVersion: '8.11.1', gradleVersion: '8.14', kotlinVersion: '2.2.20'), ]; // Max length is 7 entries until this test is split See https://github.com/flutter/flutter/issues/167495. Future main() async { 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 e2e0c8b56fe..0675f01f295 100644 --- a/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/android_semantics_testing/android/buildscript-gradle.lockfile @@ -1,50 +1,50 @@ # 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.11.0=classpath -androidx.databinding:databinding-compiler-common:8.11.0=classpath -com.android.application:com.android.application.gradle.plugin:8.11.0=classpath -com.android.databinding:baseLibrary:8.11.0=classpath -com.android.tools.analytics-library:crash:31.11.0=classpath -com.android.tools.analytics-library:protos:31.11.0=classpath -com.android.tools.analytics-library:shared:31.11.0=classpath -com.android.tools.analytics-library:tracker:31.11.0=classpath +androidx.databinding:databinding-common:8.11.1=classpath +androidx.databinding:databinding-compiler-common:8.11.1=classpath +com.android.application:com.android.application.gradle.plugin:8.11.1=classpath +com.android.databinding:baseLibrary:8.11.1=classpath +com.android.tools.analytics-library:crash:31.11.1=classpath +com.android.tools.analytics-library:protos:31.11.1=classpath +com.android.tools.analytics-library:shared:31.11.1=classpath +com.android.tools.analytics-library:tracker:31.11.1=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.11.0-12782657=classpath -com.android.tools.build:aaptcompiler:8.11.0=classpath -com.android.tools.build:apksig:8.11.0=classpath -com.android.tools.build:apkzlib:8.11.0=classpath -com.android.tools.build:builder-model:8.11.0=classpath -com.android.tools.build:builder-test-api:8.11.0=classpath -com.android.tools.build:builder:8.11.0=classpath +com.android.tools.build:aapt2-proto:8.11.1-12782657=classpath +com.android.tools.build:aaptcompiler:8.11.1=classpath +com.android.tools.build:apksig:8.11.1=classpath +com.android.tools.build:apkzlib:8.11.1=classpath +com.android.tools.build:builder-model:8.11.1=classpath +com.android.tools.build:builder-test-api:8.11.1=classpath +com.android.tools.build:builder:8.11.1=classpath com.android.tools.build:bundletool:1.18.1=classpath -com.android.tools.build:gradle-api:8.11.0=classpath -com.android.tools.build:gradle-settings-api:8.11.0=classpath -com.android.tools.build:gradle:8.11.0=classpath -com.android.tools.build:manifest-merger:31.11.0=classpath +com.android.tools.build:gradle-api:8.11.1=classpath +com.android.tools.build:gradle-settings-api:8.11.1=classpath +com.android.tools.build:gradle:8.11.1=classpath +com.android.tools.build:manifest-merger:31.11.1=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:31.11.0=classpath -com.android.tools.layoutlib:layoutlib-api:31.11.0=classpath -com.android.tools.lint:lint-model:31.11.0=classpath -com.android.tools.lint:lint-typedef-remover:31.11.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=classpath -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=classpath -com.android.tools:annotations:31.11.0=classpath -com.android.tools:common:31.11.0=classpath -com.android.tools:dvlib:31.11.0=classpath -com.android.tools:repository:31.11.0=classpath -com.android.tools:sdk-common:31.11.0=classpath -com.android.tools:sdklib:31.11.0=classpath -com.android:signflinger:8.11.0=classpath -com.android:zipflinger:8.11.0=classpath +com.android.tools.ddms:ddmlib:31.11.1=classpath +com.android.tools.layoutlib:layoutlib-api:31.11.1=classpath +com.android.tools.lint:lint-model:31.11.1=classpath +com.android.tools.lint:lint-typedef-remover:31.11.1=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=classpath +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=classpath +com.android.tools:annotations:31.11.1=classpath +com.android.tools:common:31.11.1=classpath +com.android.tools:dvlib:31.11.1=classpath +com.android.tools:repository:31.11.1=classpath +com.android.tools:sdk-common:31.11.1=classpath +com.android.tools:sdklib:31.11.1=classpath +com.android:signflinger:8.11.1=classpath +com.android:zipflinger:8.11.1=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.48.0=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath @@ -113,31 +113,31 @@ org.codehaus.mojo:animal-sniffer-annotations:1.24=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.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:2.2.0=classpath -org.jetbrains.kotlin:abi-tools-api:2.2.0=classpath -org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.2.0=classpath -org.jetbrains.kotlin:kotlin-build-statistics:2.2.0=classpath -org.jetbrains.kotlin:kotlin-build-tools-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-compiler-runner:2.2.0=classpath -org.jetbrains.kotlin:kotlin-daemon-client:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.2.0=classpath -org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-native-utils:2.2.0=classpath +org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:2.2.20=classpath +org.jetbrains.kotlin:abi-tools-api:2.2.20=classpath +org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.2.20=classpath +org.jetbrains.kotlin:kotlin-build-statistics:2.2.20=classpath +org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=classpath +org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.2.20=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-native-utils:2.2.20=classpath org.jetbrains.kotlin:kotlin-reflect:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib:2.1.20=classpath -org.jetbrains.kotlin:kotlin-tooling-core:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-io:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-klib-metadata:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-klib:2.2.0=classpath +org.jetbrains.kotlin:kotlin-tooling-core:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-io:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-klib-metadata:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-klib:2.2.20=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath diff --git a/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties index 02767eb1ca4..e4ef43fb98d 100644 --- a/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/android_semantics_testing/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip 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 6b2ebbaf897..7ba38e47df1 100644 --- a/dev/integration_tests/android_semantics_testing/android/project-app.lockfile +++ b/dev/integration_tests/android_semantics_testing/android/project-app.lockfile @@ -52,8 +52,8 @@ com.android.tools.build:builder:4.1.3=lintClassPath com.android.tools.build:gradle-api:4.1.3=lintClassPath com.android.tools.build:manifest-merger:27.1.3=lintClassPath com.android.tools.ddms:ddmlib:27.1.3=lintClassPath -com.android.tools.ddms:ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.emulator:proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.ddms:ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.emulator:proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control com.android.tools.emulator:proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath @@ -65,35 +65,35 @@ com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath com.android.tools.lint:lint-gradle:27.1.3=lintClassPath com.android.tools.lint:lint-model:27.1.3=lintClassPath com.android.tools.lint:lint:27.1.3=lintClassPath -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-gradle:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-coverage:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-device-info:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat -com.android.tools.utp:android-test-plugin-host-logcat:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-gradle:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-coverage:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-device-info:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-host-logcat:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.utp:android-test-plugin-host-retention:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:utp-common:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:utp-common:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:utp-common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools:annotations:27.1.3=lintClassPath -com.android.tools:annotations:31.11.0=_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-result-listener-gradle +com.android.tools:annotations:31.11.1=_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-result-listener-gradle com.android.tools:annotations:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools:common:27.1.3=lintClassPath -com.android.tools:common:31.11.0=_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-result-listener-gradle +com.android.tools:common:31.11.1=_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-result-listener-gradle com.android.tools:common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools:dvlib:27.1.3=lintClassPath com.android.tools:repository:27.1.3=lintClassPath @@ -102,6 +102,7 @@ com.android.tools:sdklib:27.1.3=lintClassPath com.android:signflinger:4.1.3=lintClassPath com.android:zipflinger:4.1.3=lintClassPath com.getkeepsafe.relinker:relinker:1.4.5=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +com.github.ben-manes.caffeine:caffeine:2.9.3=swiftExportClasspathResolvable com.google.android:annotations:4.1.1.4=_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,_internal-unified-test-platform-core com.google.api.grpc:proto-google-common-protos:2.17.0=_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-logcat,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-core com.google.api.grpc:proto-google-common-protos:2.48.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-result-listener-gradle @@ -118,7 +119,7 @@ com.google.crypto.tink:tink:1.7.0=_internal-unified-test-platform-android-test-p com.google.dagger:dagger:2.48=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-driver-instrumentation,_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-result-listener-gradle,_internal-unified-test-platform-core com.google.errorprone:error_prone_annotations:2.18.0=_internal-unified-test-platform-android-test-plugin-host-retention com.google.errorprone:error_prone_annotations:2.23.0=_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher -com.google.errorprone:error_prone_annotations:2.28.0=_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-logcat +com.google.errorprone:error_prone_annotations:2.28.0=_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-logcat,swiftExportClasspathResolvable com.google.errorprone:error_prone_annotations:2.3.2=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.30.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-result-listener-gradle com.google.guava:failureaccess:1.0.1=_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher,debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath @@ -206,6 +207,8 @@ io.netty:netty-transport:4.1.110.Final=_internal-unified-test-platform-android-t io.netty:netty-transport:4.1.93.Final=_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-core io.opencensus:opencensus-api:0.31.0=_internal-unified-test-platform-core io.opencensus:opencensus-proto:0.2.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher +io.opentelemetry:opentelemetry-api:1.41.0=swiftExportClasspathResolvable +io.opentelemetry:opentelemetry-context:1.41.0=swiftExportClasspathResolvable io.perfmark:perfmark-api:0.26.0=_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-core io.perfmark:perfmark-api:0.27.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control,_internal-unified-test-platform-android-test-plugin-result-listener-gradle it.unimi.dsi:fastutil:7.2.0=lintClassPath @@ -222,12 +225,16 @@ org.apache.commons:commons-compress:1.12=lintClassPath org.apache.httpcomponents:httpclient:4.5.6=lintClassPath org.apache.httpcomponents:httpcore:4.4.10=lintClassPath org.apache.httpcomponents:httpmime:4.5.6=lintClassPath +org.bouncycastle:bcpg-jdk18on:1.80=kotlinBouncyCastleConfiguration org.bouncycastle:bcpkix-jdk15on:1.56=lintClassPath +org.bouncycastle:bcpkix-jdk18on:1.80=kotlinBouncyCastleConfiguration org.bouncycastle:bcprov-jdk15on:1.56=lintClassPath +org.bouncycastle:bcprov-jdk18on:1.80=kotlinBouncyCastleConfiguration +org.bouncycastle:bcutil-jdk18on:1.80=kotlinBouncyCastleConfiguration org.checkerframework:checker-compat-qual:2.5.5=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath org.checkerframework:checker-qual:2.8.1=lintClassPath org.checkerframework:checker-qual:3.33.0=_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin,_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher -org.checkerframework:checker-qual:3.43.0=_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-result-listener-gradle +org.checkerframework:checker-qual:3.43.0=_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-result-listener-gradle,swiftExportClasspathResolvable org.codehaus.groovy:groovy-all:2.4.15=lintClassPath org.codehaus.mojo:animal-sniffer-annotations:1.18=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,lintClassPath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath org.codehaus.mojo:animal-sniffer-annotations:1.23=_internal-unified-test-platform-android-test-plugin-host-retention,_internal-unified-test-platform-core @@ -241,30 +248,30 @@ 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.kotlin:abi-tools-api:2.2.0=kotlinInternalAbiValidation -org.jetbrains.kotlin:abi-tools:2.2.0=kotlinInternalAbiValidation -org.jetbrains.kotlin:kotlin-build-tools-api:2.2.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-compiler-runner:2.2.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-daemon-client:2.2.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.0=kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.0=kotlinInternalAbiValidation +org.jetbrains.kotlin:abi-tools-api:2.2.20=kotlinInternalAbiValidation +org.jetbrains.kotlin:abi-tools:2.2.20=kotlinInternalAbiValidation +org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-build-tools-impl:2.2.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable +org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-daemon-embeddable:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable +org.jetbrains.kotlin:kotlin-klib-commonizer-embeddable:2.2.20=kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-metadata-jvm:2.2.20=kotlinInternalAbiValidation org.jetbrains.kotlin:kotlin-reflect:1.3.72=lintClassPath -org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath +org.jetbrains.kotlin:kotlin-reflect:1.6.10=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable org.jetbrains.kotlin:kotlin-reflect:1.8.21=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin,_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-result-listener-gradle,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher -org.jetbrains.kotlin:kotlin-script-runtime:2.2.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath -org.jetbrains.kotlin:kotlin-scripting-common:2.2.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.0=kotlinBuildToolsApiClasspath -org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.0=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-script-runtime:2.2.20=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable +org.jetbrains.kotlin:kotlin-scripting-common:2.2.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:2.2.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:2.2.20=kotlinBuildToolsApiClasspath +org.jetbrains.kotlin:kotlin-scripting-jvm:2.2.20=kotlinBuildToolsApiClasspath org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=lintClassPath org.jetbrains.kotlin:kotlin-stdlib-common:1.8.21=_internal-unified-test-platform-android-test-plugin,_internal-unified-test-platform-core org.jetbrains.kotlin:kotlin-stdlib-common:1.9.0=_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-launcher org.jetbrains.kotlin:kotlin-stdlib-common:1.9.20=_internal-unified-test-platform-android-test-plugin-host-retention org.jetbrains.kotlin:kotlin-stdlib-common:2.1.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-result-listener-gradle -org.jetbrains.kotlin:kotlin-stdlib-common:2.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib-common:2.2.20=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=lintClassPath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20=_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20=_internal-unified-test-platform-android-test-plugin-host-retention @@ -278,7 +285,8 @@ org.jetbrains.kotlin:kotlin-stdlib:1.8.21=_internal-unified-test-platform-androi org.jetbrains.kotlin:kotlin-stdlib:1.9.0=_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-launcher org.jetbrains.kotlin:kotlin-stdlib:1.9.20=_internal-unified-test-platform-android-test-plugin-host-retention org.jetbrains.kotlin:kotlin-stdlib:2.1.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-result-listener-gradle -org.jetbrains.kotlin:kotlin-stdlib:2.2.0=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath +org.jetbrains.kotlin:kotlin-stdlib:2.2.20=apiDependenciesMetadata,debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,implementationDependenciesMetadata,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath,swiftExportClasspathResolvable +org.jetbrains.kotlin:swift-export-embeddable:2.2.20=swiftExportClasspathResolvable org.jetbrains.kotlinx:atomicfu-jvm:0.22.0=_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_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-launcher org.jetbrains.kotlinx:atomicfu:0.22.0=_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_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-launcher org.jetbrains.kotlinx:kotlinx-coroutines-android:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath @@ -288,12 +296,15 @@ org.jetbrains.kotlinx:kotlinx-coroutines-bom:1.7.3=_internal-unified-test-platfo org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.6.4=_internal-unified-test-platform-android-test-plugin-host-retention 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-jvm:1.7.3=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin,_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-result-listener-gradle,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher -org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,swiftExportClasspathResolvable org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4=_internal-unified-test-platform-android-test-plugin-host-retention org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3=_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-result-listener-gradle,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher +org.jetbrains.kotlinx:kotlinx-serialization-bom:1.7.3=swiftExportClasspathResolvable +org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.7.3=swiftExportClasspathResolvable +org.jetbrains.kotlinx:kotlinx-serialization-core:1.7.3=swiftExportClasspathResolvable org.jetbrains.trove4j:trove4j:20160824=lintClassPath -org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-test-plugin-host-retention,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,lintClassPath +org.jetbrains:annotations:13.0=_internal-unified-test-platform-android-test-plugin-host-retention,kotlinBuildToolsApiClasspath,kotlinCompilerClasspath,kotlinInternalAbiValidation,kotlinKlibCommonizerClasspath,lintClassPath,swiftExportClasspathResolvable org.jetbrains:annotations:23.0.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle,_internal-unified-test-platform-android-driver-instrumentation,_internal-unified-test-platform-android-test-plugin,_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-result-listener-gradle,_internal-unified-test-platform-core,_internal-unified-test-platform-launcher,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_semantics_testing/android/project-integration_test.lockfile b/dev/integration_tests/android_semantics_testing/android/project-integration_test.lockfile index d2749e1e14d..6cc98783285 100644 --- a/dev/integration_tests/android_semantics_testing/android/project-integration_test.lockfile +++ b/dev/integration_tests/android_semantics_testing/android/project-integration_test.lockfile @@ -51,8 +51,8 @@ com.android.tools.build:builder:4.1.3=lintClassPath com.android.tools.build:gradle-api:4.1.3=lintClassPath com.android.tools.build:manifest-merger:27.1.3=lintClassPath com.android.tools.ddms:ddmlib:27.1.3=lintClassPath -com.android.tools.ddms:ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.emulator:proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.ddms:ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.emulator:proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control com.android.tools.emulator:proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.external.com-intellij:intellij-core:27.1.3=lintClassPath com.android.tools.external.com-intellij:kotlin-compiler:27.1.3=lintClassPath @@ -64,35 +64,35 @@ com.android.tools.lint:lint-gradle-api:27.1.3=lintClassPath com.android.tools.lint:lint-gradle:27.1.3=lintClassPath com.android.tools.lint:lint-model:27.1.3=lintClassPath com.android.tools.lint:lint:27.1.3=lintClassPath -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-gradle:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-coverage:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-device-info:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat -com.android.tools.utp:android-test-plugin-host-logcat:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-gradle:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-coverage:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-device-info:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-host-logcat:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.utp:android-test-plugin-host-retention:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:utp-common:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:utp-common:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:utp-common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools:annotations:27.1.3=lintClassPath -com.android.tools:annotations:31.11.0=_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-result-listener-gradle +com.android.tools:annotations:31.11.1=_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-result-listener-gradle com.android.tools:annotations:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools:common:27.1.3=lintClassPath -com.android.tools:common:31.11.0=_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-result-listener-gradle +com.android.tools:common:31.11.1=_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-result-listener-gradle com.android.tools:common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools:dvlib:27.1.3=lintClassPath com.android.tools:repository:27.1.3=lintClassPath diff --git a/dev/integration_tests/android_semantics_testing/android/settings.gradle b/dev/integration_tests/android_semantics_testing/android/settings.gradle index f4350407872..239244ee26d 100644 --- a/dev/integration_tests/android_semantics_testing/android/settings.gradle +++ b/dev/integration_tests/android_semantics_testing/android/settings.gradle @@ -34,8 +34,8 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.11.0" apply false - id "org.jetbrains.kotlin.android" version "2.2.0" apply false + id "com.android.application" version "8.11.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } include ":app" diff --git a/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile b/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile index e2e0c8b56fe..0675f01f295 100644 --- a/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/flutter_gallery/android/buildscript-gradle.lockfile @@ -1,50 +1,50 @@ # 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.11.0=classpath -androidx.databinding:databinding-compiler-common:8.11.0=classpath -com.android.application:com.android.application.gradle.plugin:8.11.0=classpath -com.android.databinding:baseLibrary:8.11.0=classpath -com.android.tools.analytics-library:crash:31.11.0=classpath -com.android.tools.analytics-library:protos:31.11.0=classpath -com.android.tools.analytics-library:shared:31.11.0=classpath -com.android.tools.analytics-library:tracker:31.11.0=classpath +androidx.databinding:databinding-common:8.11.1=classpath +androidx.databinding:databinding-compiler-common:8.11.1=classpath +com.android.application:com.android.application.gradle.plugin:8.11.1=classpath +com.android.databinding:baseLibrary:8.11.1=classpath +com.android.tools.analytics-library:crash:31.11.1=classpath +com.android.tools.analytics-library:protos:31.11.1=classpath +com.android.tools.analytics-library:shared:31.11.1=classpath +com.android.tools.analytics-library:tracker:31.11.1=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.11.0-12782657=classpath -com.android.tools.build:aaptcompiler:8.11.0=classpath -com.android.tools.build:apksig:8.11.0=classpath -com.android.tools.build:apkzlib:8.11.0=classpath -com.android.tools.build:builder-model:8.11.0=classpath -com.android.tools.build:builder-test-api:8.11.0=classpath -com.android.tools.build:builder:8.11.0=classpath +com.android.tools.build:aapt2-proto:8.11.1-12782657=classpath +com.android.tools.build:aaptcompiler:8.11.1=classpath +com.android.tools.build:apksig:8.11.1=classpath +com.android.tools.build:apkzlib:8.11.1=classpath +com.android.tools.build:builder-model:8.11.1=classpath +com.android.tools.build:builder-test-api:8.11.1=classpath +com.android.tools.build:builder:8.11.1=classpath com.android.tools.build:bundletool:1.18.1=classpath -com.android.tools.build:gradle-api:8.11.0=classpath -com.android.tools.build:gradle-settings-api:8.11.0=classpath -com.android.tools.build:gradle:8.11.0=classpath -com.android.tools.build:manifest-merger:31.11.0=classpath +com.android.tools.build:gradle-api:8.11.1=classpath +com.android.tools.build:gradle-settings-api:8.11.1=classpath +com.android.tools.build:gradle:8.11.1=classpath +com.android.tools.build:manifest-merger:31.11.1=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:31.11.0=classpath -com.android.tools.layoutlib:layoutlib-api:31.11.0=classpath -com.android.tools.lint:lint-model:31.11.0=classpath -com.android.tools.lint:lint-typedef-remover:31.11.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=classpath -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=classpath -com.android.tools:annotations:31.11.0=classpath -com.android.tools:common:31.11.0=classpath -com.android.tools:dvlib:31.11.0=classpath -com.android.tools:repository:31.11.0=classpath -com.android.tools:sdk-common:31.11.0=classpath -com.android.tools:sdklib:31.11.0=classpath -com.android:signflinger:8.11.0=classpath -com.android:zipflinger:8.11.0=classpath +com.android.tools.ddms:ddmlib:31.11.1=classpath +com.android.tools.layoutlib:layoutlib-api:31.11.1=classpath +com.android.tools.lint:lint-model:31.11.1=classpath +com.android.tools.lint:lint-typedef-remover:31.11.1=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=classpath +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=classpath +com.android.tools:annotations:31.11.1=classpath +com.android.tools:common:31.11.1=classpath +com.android.tools:dvlib:31.11.1=classpath +com.android.tools:repository:31.11.1=classpath +com.android.tools:sdk-common:31.11.1=classpath +com.android.tools:sdklib:31.11.1=classpath +com.android:signflinger:8.11.1=classpath +com.android:zipflinger:8.11.1=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.48.0=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath @@ -113,31 +113,31 @@ org.codehaus.mojo:animal-sniffer-annotations:1.24=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.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:2.2.0=classpath -org.jetbrains.kotlin:abi-tools-api:2.2.0=classpath -org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.2.0=classpath -org.jetbrains.kotlin:kotlin-build-statistics:2.2.0=classpath -org.jetbrains.kotlin:kotlin-build-tools-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-compiler-runner:2.2.0=classpath -org.jetbrains.kotlin:kotlin-daemon-client:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.2.0=classpath -org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-native-utils:2.2.0=classpath +org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:2.2.20=classpath +org.jetbrains.kotlin:abi-tools-api:2.2.20=classpath +org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.2.20=classpath +org.jetbrains.kotlin:kotlin-build-statistics:2.2.20=classpath +org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=classpath +org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.2.20=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-native-utils:2.2.20=classpath org.jetbrains.kotlin:kotlin-reflect:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib-common:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib:2.1.20=classpath -org.jetbrains.kotlin:kotlin-tooling-core:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-io:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-klib-metadata:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-klib:2.2.0=classpath +org.jetbrains.kotlin:kotlin-tooling-core:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-io:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-klib-metadata:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-klib:2.2.20=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath diff --git a/dev/integration_tests/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties index 02767eb1ca4..e4ef43fb98d 100644 --- a/dev/integration_tests/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/flutter_gallery/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/dev/integration_tests/flutter_gallery/android/project-app.lockfile b/dev/integration_tests/flutter_gallery/android/project-app.lockfile index 44d66a7de74..8624b72f013 100644 --- a/dev/integration_tests/flutter_gallery/android/project-app.lockfile +++ b/dev/integration_tests/flutter_gallery/android/project-app.lockfile @@ -53,36 +53,36 @@ androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompile androidx.window.extensions.core:core:1.0.0=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath androidx.window:window-java:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath androidx.window:window:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -com.android.tools.ddms:ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.emulator:proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.ddms:ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.emulator:proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control com.android.tools.emulator:proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-gradle:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-coverage:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-device-info:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat -com.android.tools.utp:android-test-plugin-host-logcat:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-gradle:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-coverage:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-device-info:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-host-logcat:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.utp:android-test-plugin-host-retention:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:utp-common:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:utp-common:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:utp-common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:annotations:31.11.0=_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-result-listener-gradle +com.android.tools:annotations:31.11.1=_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-result-listener-gradle com.android.tools:annotations:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:common:31.11.0=_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-result-listener-gradle +com.android.tools:common:31.11.1=_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-result-listener-gradle com.android.tools:common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.getkeepsafe.relinker:relinker:1.4.5=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.google.android:annotations:4.1.1.4=_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,_internal-unified-test-platform-core diff --git a/dev/integration_tests/flutter_gallery/android/project-integration_test.lockfile b/dev/integration_tests/flutter_gallery/android/project-integration_test.lockfile index c8878de1e3c..e3b5f6c5360 100644 --- a/dev/integration_tests/flutter_gallery/android/project-integration_test.lockfile +++ b/dev/integration_tests/flutter_gallery/android/project-integration_test.lockfile @@ -38,36 +38,36 @@ androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugAndroid androidx.window.extensions.core:core:1.0.0=debugAndroidTestRuntimeClasspath,debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath androidx.window:window-java:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath androidx.window:window:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -com.android.tools.ddms:ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.emulator:proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.ddms:ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.emulator:proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control com.android.tools.emulator:proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-gradle:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-coverage:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-device-info:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat -com.android.tools.utp:android-test-plugin-host-logcat:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-gradle:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-coverage:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-device-info:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-host-logcat:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.utp:android-test-plugin-host-retention:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:utp-common:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:utp-common:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:utp-common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:annotations:31.11.0=_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-result-listener-gradle +com.android.tools:annotations:31.11.1=_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-result-listener-gradle com.android.tools:annotations:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:common:31.11.0=_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-result-listener-gradle +com.android.tools:common:31.11.1=_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-result-listener-gradle com.android.tools:common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.getkeepsafe.relinker:relinker:1.4.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.google.android:annotations:4.1.1.4=_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,_internal-unified-test-platform-core diff --git a/dev/integration_tests/flutter_gallery/android/project-url_launcher_android.lockfile b/dev/integration_tests/flutter_gallery/android/project-url_launcher_android.lockfile index 9218d050452..cd40b47db42 100644 --- a/dev/integration_tests/flutter_gallery/android/project-url_launcher_android.lockfile +++ b/dev/integration_tests/flutter_gallery/android/project-url_launcher_android.lockfile @@ -40,36 +40,36 @@ androidx.window.extensions.core:core:1.0.0=debugAndroidTestRuntimeClasspath,debu androidx.window:window-java:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath androidx.window:window:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.almworks.sqlite4java:sqlite4java:1.0.392=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -com.android.tools.ddms:ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.emulator:proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.ddms:ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.emulator:proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control com.android.tools.emulator:proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-gradle:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-coverage:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-device-info:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat -com.android.tools.utp:android-test-plugin-host-logcat:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-gradle:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-coverage:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-device-info:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-host-logcat:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.utp:android-test-plugin-host-retention:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:utp-common:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:utp-common:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:utp-common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:annotations:31.11.0=_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-result-listener-gradle +com.android.tools:annotations:31.11.1=_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-result-listener-gradle com.android.tools:annotations:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:common:31.11.0=_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-result-listener-gradle +com.android.tools:common:31.11.1=_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-result-listener-gradle com.android.tools:common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.getkeepsafe.relinker:relinker:1.4.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.google.android:annotations:4.1.1.4=_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,_internal-unified-test-platform-core diff --git a/dev/integration_tests/flutter_gallery/android/project-video_player_android.lockfile b/dev/integration_tests/flutter_gallery/android/project-video_player_android.lockfile index 83f44096397..9ed94f6a00e 100644 --- a/dev/integration_tests/flutter_gallery/android/project-video_player_android.lockfile +++ b/dev/integration_tests/flutter_gallery/android/project-video_player_android.lockfile @@ -55,36 +55,36 @@ androidx.window.extensions.core:core:1.0.0=debugAndroidTestRuntimeClasspath,debu androidx.window:window-java:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath androidx.window:window:1.2.0=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.almworks.sqlite4java:sqlite4java:1.0.392=debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -com.android.tools.ddms:ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.emulator:proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.ddms:ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.emulator:proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control com.android.tools.emulator:proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-gradle:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-coverage:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-device-info:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat -com.android.tools.utp:android-test-plugin-host-logcat:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-gradle:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-coverage:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-device-info:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-host-logcat:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.utp:android-test-plugin-host-retention:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:utp-common:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:utp-common:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:utp-common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:annotations:31.11.0=_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-result-listener-gradle +com.android.tools:annotations:31.11.1=_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-result-listener-gradle com.android.tools:annotations:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:common:31.11.0=_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-result-listener-gradle +com.android.tools:common:31.11.1=_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-result-listener-gradle com.android.tools:common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.getkeepsafe.relinker:relinker:1.4.5=debugAndroidTestCompileClasspath,debugAndroidTestRuntimeClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.google.android:annotations:4.1.1.4=_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,_internal-unified-test-platform-core diff --git a/dev/integration_tests/flutter_gallery/android/settings.gradle b/dev/integration_tests/flutter_gallery/android/settings.gradle index f4350407872..239244ee26d 100644 --- a/dev/integration_tests/flutter_gallery/android/settings.gradle +++ b/dev/integration_tests/flutter_gallery/android/settings.gradle @@ -34,8 +34,8 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.11.0" apply false - id "org.jetbrains.kotlin.android" version "2.2.0" apply false + id "com.android.application" version "8.11.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } include ":app" diff --git a/dev/tools/bin/generate_gradle_lockfiles.dart b/dev/tools/bin/generate_gradle_lockfiles.dart index 6385f1f53db..77567ac7bc3 100644 --- a/dev/tools/bin/generate_gradle_lockfiles.dart +++ b/dev/tools/bin/generate_gradle_lockfiles.dart @@ -291,8 +291,8 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "8.11.0" apply false - id "org.jetbrains.kotlin.android" version "2.2.0" apply false + id "com.android.application" version "8.11.1" apply false + id "org.jetbrains.kotlin.android" version "2.2.20" apply false } include ":app" @@ -387,8 +387,8 @@ buildscript { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.0" apply false - id("org.jetbrains.kotlin.android") version "2.2.0" apply false + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") @@ -399,7 +399,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip '''; Iterable discoverAndroidDirectories(Directory repoRoot) { diff --git a/examples/hello_world/android/buildscript-gradle.lockfile b/examples/hello_world/android/buildscript-gradle.lockfile index aec81c9c60c..0b497c33be0 100644 --- a/examples/hello_world/android/buildscript-gradle.lockfile +++ b/examples/hello_world/android/buildscript-gradle.lockfile @@ -1,50 +1,50 @@ # 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.11.0=classpath -androidx.databinding:databinding-compiler-common:8.11.0=classpath -com.android.application:com.android.application.gradle.plugin:8.11.0=classpath -com.android.databinding:baseLibrary:8.11.0=classpath -com.android.tools.analytics-library:crash:31.11.0=classpath -com.android.tools.analytics-library:protos:31.11.0=classpath -com.android.tools.analytics-library:shared:31.11.0=classpath -com.android.tools.analytics-library:tracker:31.11.0=classpath +androidx.databinding:databinding-common:8.11.1=classpath +androidx.databinding:databinding-compiler-common:8.11.1=classpath +com.android.application:com.android.application.gradle.plugin:8.11.1=classpath +com.android.databinding:baseLibrary:8.11.1=classpath +com.android.tools.analytics-library:crash:31.11.1=classpath +com.android.tools.analytics-library:protos:31.11.1=classpath +com.android.tools.analytics-library:shared:31.11.1=classpath +com.android.tools.analytics-library:tracker:31.11.1=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.11.0-12782657=classpath -com.android.tools.build:aaptcompiler:8.11.0=classpath -com.android.tools.build:apksig:8.11.0=classpath -com.android.tools.build:apkzlib:8.11.0=classpath -com.android.tools.build:builder-model:8.11.0=classpath -com.android.tools.build:builder-test-api:8.11.0=classpath -com.android.tools.build:builder:8.11.0=classpath +com.android.tools.build:aapt2-proto:8.11.1-12782657=classpath +com.android.tools.build:aaptcompiler:8.11.1=classpath +com.android.tools.build:apksig:8.11.1=classpath +com.android.tools.build:apkzlib:8.11.1=classpath +com.android.tools.build:builder-model:8.11.1=classpath +com.android.tools.build:builder-test-api:8.11.1=classpath +com.android.tools.build:builder:8.11.1=classpath com.android.tools.build:bundletool:1.18.1=classpath -com.android.tools.build:gradle-api:8.11.0=classpath -com.android.tools.build:gradle-settings-api:8.11.0=classpath -com.android.tools.build:gradle:8.11.0=classpath -com.android.tools.build:manifest-merger:31.11.0=classpath +com.android.tools.build:gradle-api:8.11.1=classpath +com.android.tools.build:gradle-settings-api:8.11.1=classpath +com.android.tools.build:gradle:8.11.1=classpath +com.android.tools.build:manifest-merger:31.11.1=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:31.11.0=classpath -com.android.tools.layoutlib:layoutlib-api:31.11.0=classpath -com.android.tools.lint:lint-model:31.11.0=classpath -com.android.tools.lint:lint-typedef-remover:31.11.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=classpath -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=classpath -com.android.tools:annotations:31.11.0=classpath -com.android.tools:common:31.11.0=classpath -com.android.tools:dvlib:31.11.0=classpath -com.android.tools:repository:31.11.0=classpath -com.android.tools:sdk-common:31.11.0=classpath -com.android.tools:sdklib:31.11.0=classpath -com.android:signflinger:8.11.0=classpath -com.android:zipflinger:8.11.0=classpath +com.android.tools.ddms:ddmlib:31.11.1=classpath +com.android.tools.layoutlib:layoutlib-api:31.11.1=classpath +com.android.tools.lint:lint-model:31.11.1=classpath +com.android.tools.lint:lint-typedef-remover:31.11.1=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=classpath +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=classpath +com.android.tools:annotations:31.11.1=classpath +com.android.tools:common:31.11.1=classpath +com.android.tools:dvlib:31.11.1=classpath +com.android.tools:repository:31.11.1=classpath +com.android.tools:sdk-common:31.11.1=classpath +com.android.tools:sdklib:31.11.1=classpath +com.android:signflinger:8.11.1=classpath +com.android:zipflinger:8.11.1=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.48.0=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath @@ -113,31 +113,31 @@ org.codehaus.mojo:animal-sniffer-annotations:1.24=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.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:2.2.0=classpath -org.jetbrains.kotlin:abi-tools-api:2.2.0=classpath -org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.2.0=classpath -org.jetbrains.kotlin:kotlin-build-statistics:2.2.0=classpath -org.jetbrains.kotlin:kotlin-build-tools-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-compiler-runner:2.2.0=classpath -org.jetbrains.kotlin:kotlin-daemon-client:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.0=classpath -org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.2.0=classpath -org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.2.0=classpath -org.jetbrains.kotlin:kotlin-native-utils:2.2.0=classpath +org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:2.2.20=classpath +org.jetbrains.kotlin:abi-tools-api:2.2.20=classpath +org.jetbrains.kotlin:fus-statistics-gradle-plugin:2.2.20=classpath +org.jetbrains.kotlin:kotlin-build-statistics:2.2.20=classpath +org.jetbrains.kotlin:kotlin-build-tools-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:2.2.20=classpath +org.jetbrains.kotlin:kotlin-daemon-client:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:2.2.20=classpath +org.jetbrains.kotlin:kotlin-gradle-plugins-bom:2.2.20=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:2.2.20=classpath +org.jetbrains.kotlin:kotlin-native-utils:2.2.20=classpath org.jetbrains.kotlin:kotlin-reflect:2.0.21=classpath org.jetbrains.kotlin:kotlin-stdlib-common:2.0.21=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.1.20=classpath org.jetbrains.kotlin:kotlin-stdlib:2.0.21=classpath -org.jetbrains.kotlin:kotlin-tooling-core:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-io:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-klib-metadata:2.2.0=classpath -org.jetbrains.kotlin:kotlin-util-klib:2.2.0=classpath +org.jetbrains.kotlin:kotlin-tooling-core:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-io:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-klib-metadata:2.2.20=classpath +org.jetbrains.kotlin:kotlin-util-klib:2.2.20=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.8.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.4.0=classpath org.jetbrains.kotlinx:kotlinx-serialization-core:1.4.0=classpath diff --git a/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties b/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties index 02767eb1ca4..e4ef43fb98d 100644 --- a/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties +++ b/examples/hello_world/android/gradle/wrapper/gradle-wrapper.properties @@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip diff --git a/examples/hello_world/android/project-app.lockfile b/examples/hello_world/android/project-app.lockfile index 83ddc6dc5cf..51732ade294 100644 --- a/examples/hello_world/android/project-app.lockfile +++ b/examples/hello_world/android/project-app.lockfile @@ -34,36 +34,36 @@ androidx.viewpager:viewpager:1.0.0=debugAndroidTestCompileClasspath,debugCompile androidx.window.extensions.core:core:1.0.0=debugRuntimeClasspath,debugUnitTestRuntimeClasspath,profileRuntimeClasspath,profileUnitTestRuntimeClasspath,releaseRuntimeClasspath,releaseUnitTestRuntimeClasspath androidx.window:window-java:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath androidx.window:window:1.2.0=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath -com.android.tools.ddms:ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.emulator:proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.ddms:ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.emulator:proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control com.android.tools.emulator:proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-ddmlib:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib -com.android.tools.utp:android-device-provider-gradle-proto:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-gradle:31.11.0=_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile-proto:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-device-provider-profile:31.11.0=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output -com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.0=_internal-unified-test-platform-android-test-plugin-host-apk-installer -com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-coverage:31.11.0=_internal-unified-test-platform-android-test-plugin-host-coverage -com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-device-info:31.11.0=_internal-unified-test-platform-android-test-plugin-host-device-info -com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.0=_internal-unified-test-platform-android-test-plugin-host-emulator-control -com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat -com.android.tools.utp:android-test-plugin-host-logcat:31.11.0=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-device-provider-ddmlib-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-ddmlib:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib +com.android.tools.utp:android-device-provider-gradle-proto:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-gradle:31.11.1=_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile-proto:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-device-provider-profile:31.11.1=_internal-unified-test-platform-android-device-provider-ddmlib,_internal-unified-test-platform-android-device-provider-gradle +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-additional-test-output:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-apk-installer:31.11.1=_internal-unified-test-platform-android-test-plugin-host-apk-installer +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-coverage:31.11.1=_internal-unified-test-platform-android-test-plugin-host-coverage +com.android.tools.utp:android-test-plugin-host-device-info-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-device-info:31.11.1=_internal-unified-test-platform-android-test-plugin-host-device-info +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-emulator-control:31.11.1=_internal-unified-test-platform-android-test-plugin-host-emulator-control +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-host-logcat:31.11.1=_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:android-test-plugin-host-retention-proto:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.android.tools.utp:android-test-plugin-host-retention:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.0=_internal-unified-test-platform-android-test-plugin-result-listener-gradle -com.android.tools.utp:utp-common:31.11.0=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:android-test-plugin-result-listener-gradle:31.11.1=_internal-unified-test-platform-android-test-plugin-result-listener-gradle +com.android.tools.utp:utp-common:31.11.1=_internal-unified-test-platform-android-test-plugin-host-additional-test-output,_internal-unified-test-platform-android-test-plugin-host-device-info,_internal-unified-test-platform-android-test-plugin-host-logcat com.android.tools.utp:utp-common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:annotations:31.11.0=_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-result-listener-gradle +com.android.tools:annotations:31.11.1=_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-result-listener-gradle com.android.tools:annotations:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention -com.android.tools:common:31.11.0=_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-result-listener-gradle +com.android.tools:common:31.11.1=_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-result-listener-gradle com.android.tools:common:31.7.0=_internal-unified-test-platform-android-test-plugin-host-retention com.getkeepsafe.relinker:relinker:1.4.5=debugAndroidTestCompileClasspath,debugCompileClasspath,debugRuntimeClasspath,debugUnitTestCompileClasspath,debugUnitTestRuntimeClasspath,profileCompileClasspath,profileRuntimeClasspath,profileUnitTestCompileClasspath,profileUnitTestRuntimeClasspath,releaseCompileClasspath,releaseRuntimeClasspath,releaseUnitTestCompileClasspath,releaseUnitTestRuntimeClasspath com.google.android:annotations:4.1.1.4=_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,_internal-unified-test-platform-core diff --git a/examples/hello_world/android/settings.gradle.kts b/examples/hello_world/android/settings.gradle.kts index 6186d68a25b..f2b4712ff74 100644 --- a/examples/hello_world/android/settings.gradle.kts +++ b/examples/hello_world/android/settings.gradle.kts @@ -34,8 +34,8 @@ buildscript { plugins { id("dev.flutter.flutter-plugin-loader") version "1.0.0" - id("com.android.application") version "8.11.0" apply false - id("org.jetbrains.kotlin.android") version "2.2.0" apply false + id("com.android.application") version "8.11.1" apply false + id("org.jetbrains.kotlin.android") version "2.2.20" apply false } include(":app") diff --git a/packages/flutter_tools/gradle/build.gradle.kts b/packages/flutter_tools/gradle/build.gradle.kts index 1ce1902e6bd..31fc5cbaedc 100644 --- a/packages/flutter_tools/gradle/build.gradle.kts +++ b/packages/flutter_tools/gradle/build.gradle.kts @@ -62,10 +62,10 @@ dependencies { // * AGP version constants in packages/flutter_tools/lib/src/android/gradle_utils.dart // * ndkVersion constant in packages/flutter_tools/lib/src/android/gradle_utils.dart // * ndkVersion in FlutterExtension in packages/flutter_tools/gradle/src/main/kotlin/FlutterExtension.kt - compileOnly("com.android.tools.build:gradle:8.11.0") + compileOnly("com.android.tools.build:gradle:8.11.1") testImplementation(kotlin("test")) - testImplementation("com.android.tools.build:gradle:8.11.0") + testImplementation("com.android.tools.build:gradle:8.11.1") testImplementation("org.mockito:mockito-core:5.8.0") testImplementation("io.mockk:mockk:1.13.16") } diff --git a/packages/flutter_tools/lib/src/android/gradle_utils.dart b/packages/flutter_tools/lib/src/android/gradle_utils.dart index 8c1c9a01ec3..3581f86adc4 100644 --- a/packages/flutter_tools/lib/src/android/gradle_utils.dart +++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart @@ -30,17 +30,17 @@ import 'android_sdk.dart'; // Please see the README before changing any of these values. // See https://gradle.org/releases -const templateDefaultGradleVersion = '8.13'; +const templateDefaultGradleVersion = '8.14'; // When bumping, also update: // * AGP version constants in packages/flutter_tools/gradle/build.gradle.kts // * AGP test constants in packages/flutter_tools/gradle/src/test/kotlin/DependencyVersionCheckerTest.kt // See https://mvnrepository.com/artifact/com.android.tools.build/gradle -const templateAndroidGradlePluginVersion = '8.11.0'; -const templateAndroidGradlePluginVersionForModule = '8.11.0'; +const templateAndroidGradlePluginVersion = '8.11.1'; +const templateAndroidGradlePluginVersionForModule = '8.11.1'; // See https://kotlinlang.org/docs/releases.html#release-details -const templateKotlinGradlePluginVersion = '2.2.0'; +const templateKotlinGradlePluginVersion = '2.2.20'; // The Flutter Gradle Plugin is only applied to app projects, and modules that // are built from source using (`include_flutter.groovy`). The remaining @@ -88,6 +88,12 @@ const maxKnownAndSupportedKgpVersion = '2.2.20'; @visibleForTesting const maxKnownAndSupportedAgpVersion = '9.0'; +// Update this when new versions of AGP with Kotlin support come out. +// +// Supported here means supported by the tooling for +// flutter analyze --suggestions and does not imply broader flutter support. +const maxKnownAgpVersionWithFullKotlinSupport = '8.11.1'; + // Update this when new versions of AGP come out. const maxKnownAgpVersion = '9.0'; @@ -650,7 +656,6 @@ bool validateAgpAndKgp(Logger logger, {required String? kgpV, required String? a 'AGP version ($agpV) older than oldest supported $oldestConsideredAgpVersion.', ); } - const maxKnownAgpVersionWithFullKotinSupport = '8.7.2'; if (isWithinVersionRange( kgpV, @@ -660,7 +665,7 @@ bool validateAgpAndKgp(Logger logger, {required String? kgpV, required String? a ) || isWithinVersionRange( agpV, - min: maxKnownAgpVersionWithFullKotinSupport, + min: maxKnownAgpVersionWithFullKotlinSupport, max: '100.100', inclusiveMin: false, )) { diff --git a/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart b/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart index abd837fe3e3..c38495ea10e 100644 --- a/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart +++ b/packages/flutter_tools/test/general.shard/android/gradle_utils_test.dart @@ -8,6 +8,7 @@ import 'package:flutter_tools/src/base/common.dart' show ToolExit; import 'package:flutter_tools/src/base/file_system.dart'; import 'package:flutter_tools/src/base/logger.dart'; import 'package:flutter_tools/src/base/platform.dart'; +import 'package:flutter_tools/src/base/version.dart'; import 'package:flutter_tools/src/base/version_range.dart'; import 'package:flutter_tools/src/cache.dart'; import 'package:flutter_tools/src/project.dart'; @@ -1002,8 +1003,7 @@ pluginManagement { KgpAgpTestData( true, kgpVersion: templateKotlinGradlePluginVersion, - // TODO(reidbaker): Replace with templateAndroidGradlePluginVersion - agpVersion: '8.7.2', + agpVersion: templateAndroidGradlePluginVersion, ), // Kotlin version at the edge of support window. @@ -1199,6 +1199,44 @@ pluginManagement { }); }); + testWithoutContext('agp versions validation', () { + final Version? parsedTemplateAndroidGradlePluginVersion = Version.parse( + templateAndroidGradlePluginVersion, + ); + final Version? parsedMaxKnownAgpVersionWithFullKotlinSupport = Version.parse( + maxKnownAgpVersionWithFullKotlinSupport, + ); + final Version? parsedMaxKnownAndSupportedAgpVersion = Version.parse( + maxKnownAndSupportedAgpVersion, + ); + final Version? parsedMaxKnownAgpVersion = Version.parse(maxKnownAgpVersion); + + expect( + parsedTemplateAndroidGradlePluginVersion! <= parsedMaxKnownAgpVersionWithFullKotlinSupport!, + isTrue, + reason: + 'Template AGP version ($parsedTemplateAndroidGradlePluginVersion) ' + 'is higher than maxKnownAgpVersionWithFullKotlinSupport ($parsedMaxKnownAgpVersionWithFullKotlinSupport). ' + 'Please update the maxKnownAgpVersionWithFullKotlinSupport', + ); + expect( + parsedMaxKnownAndSupportedAgpVersion! <= parsedMaxKnownAgpVersion!, + isTrue, + reason: + 'maxKnownAndSupportedAgpVersion ($parsedMaxKnownAndSupportedAgpVersion) ' + 'is higher than maxKnownAgpVersion ($parsedMaxKnownAgpVersion). ' + 'Please update the maxKnownAgpVersion', + ); + expect( + parsedMaxKnownAgpVersionWithFullKotlinSupport < parsedMaxKnownAgpVersion, + isTrue, + reason: + 'maxKnownAgpVersionWithFullKotlinSupport ($parsedMaxKnownAgpVersionWithFullKotlinSupport) ' + 'is higher than or equal to maxKnownAgpVersion ($parsedMaxKnownAgpVersion). ' + 'Please update the maxKnownAgpVersion', + ); + }); + group('getGradleVersionForAndroidPlugin', () { late FileSystem fileSystem; late Logger testLogger; diff --git a/packages/flutter_tools/test/integration.shard/test_data/plugin_project.dart b/packages/flutter_tools/test/integration.shard/test_data/plugin_project.dart index 1079f16293d..ec41acfa41b 100644 --- a/packages/flutter_tools/test/integration.shard/test_data/plugin_project.dart +++ b/packages/flutter_tools/test/integration.shard/test_data/plugin_project.dart @@ -16,13 +16,13 @@ class PluginDeferredComponentsConfig extends BasicDeferredComponentsConfig { @override String get androidBuild => r''' buildscript { - ext.kotlin_version = '2.2.0' + ext.kotlin_version = '2.2.20' repositories { google() mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.11.0' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } configurations.classpath {