diff --git a/.ci.yaml b/.ci.yaml index 4c0b238268c..669bbd99582 100644 --- a/.ci.yaml +++ b/.ci.yaml @@ -2249,7 +2249,7 @@ targets: task_name: complex_layout_scroll_perf_impeller__timeline_summary dependencies: >- [ - {"dependency": "open_jdk", "version": "version:11"} + {"dependency": "open_jdk", "version": "version:17"} ] - name: Linux_pixel_7pro complex_layout_scroll_perf_impeller_gles__timeline_summary @@ -2262,7 +2262,7 @@ targets: task_name: complex_layout_scroll_perf_impeller_gles__timeline_summary dependencies: >- [ - {"dependency": "open_jdk", "version": "version:11"} + {"dependency": "open_jdk", "version": "version:17"} ] # linux motog4 benchmark diff --git a/dev/a11y_assessments/android/buildscript-gradle.lockfile b/dev/a11y_assessments/android/buildscript-gradle.lockfile new file mode 100644 index 00000000000..c4ae49fa772 --- /dev/null +++ b/dev/a11y_assessments/android/buildscript-gradle.lockfile @@ -0,0 +1,156 @@ +# 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.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath +com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath +com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath +com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath +com.github.gundy:semver4j:0.16.4=classpath +com.google.android:annotations:4.1.1.4=classpath +com.google.api.grpc:proto-google-common-protos:2.0.1=classpath +com.google.auto.value:auto-value-annotations:1.6.2=classpath +com.google.code.findbugs:jsr305:3.0.2=classpath +com.google.code.gson:gson:2.8.9=classpath +com.google.crypto.tink:tink:1.7.0=classpath +com.google.dagger:dagger:2.28.3=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath +com.google.flatbuffers:flatbuffers-java:1.12.0=classpath +com.google.guava:failureaccess:1.0.1=classpath +com.google.guava:guava:31.1-jre=classpath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath +com.google.j2objc:j2objc-annotations:1.3=classpath +com.google.jimfs:jimfs:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath +com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath +com.squareup:javapoet:1.10.0=classpath +com.squareup:javawriter:2.5.0=classpath +com.sun.activation:javax.activation:1.2.0=classpath +com.sun.istack:istack-commons-runtime:3.0.8=classpath +com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath +commons-codec:commons-codec:1.11=classpath +commons-io:commons-io:2.4=classpath +commons-logging:commons-logging:1.2=classpath +de.undercouch:gradle-download-task:4.1.1=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath +io.perfmark:perfmark-api:0.23.0=classpath +jakarta.activation:jakarta.activation-api:1.2.1=classpath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath +javax.annotation:javax.annotation-api:1.3.2=classpath +javax.inject:javax.inject:1=classpath +net.java.dev.jna:jna-platform:5.6.0=classpath +net.java.dev.jna:jna:5.6.0=classpath +net.sf.jopt-simple:jopt-simple:4.9=classpath +net.sf.kxml:kxml2:2.3.0=classpath +org.apache.commons:commons-compress:1.21=classpath +org.apache.httpcomponents:httpclient:4.5.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath +org.apache.httpcomponents:httpmime:4.5.6=classpath +org.bitbucket.b_c:jose4j:0.7.0=classpath +org.bouncycastle:bcpkix-jdk15on:1.67=classpath +org.bouncycastle:bcprov-jdk15on:1.67=classpath +org.checkerframework:checker-qual:3.12.0=classpath +org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath +org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath +org.glassfish.jaxb:txw2:2.3.2=classpath +org.jdom:jdom2:2.0.6=classpath +org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath +org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.7.10=classpath +org.jetbrains.kotlin:kotlin-android-extensions:1.7.10=classpath +org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath +org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath +org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath +org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath +org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath +org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath +org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath +org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath +org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath +org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath +org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath +org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath +org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath +org.jetbrains:annotations:13.0=classpath +org.jvnet.staxex:stax-ex:1.8.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath +org.slf4j:slf4j-api:1.7.30=classpath +org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath +xerces:xercesImpl:2.12.0=classpath +xml-apis:xml-apis:1.4.01=classpath +empty= diff --git a/dev/a11y_assessments/android/gradle/wrapper/gradle-wrapper.properties b/dev/a11y_assessments/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/a11y_assessments/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/a11y_assessments/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/a11y_assessments/android/settings.gradle b/dev/a11y_assessments/android/settings.gradle index 315de6a53f4..73a4cf75b62 100644 --- a/dev/a11y_assessments/android/settings.gradle +++ b/dev/a11y_assessments/android/settings.gradle @@ -25,9 +25,16 @@ pluginManagement { } } +buildscript { + dependencyLocking { + lockFile = file("${rootProject.projectDir}/buildscript-gradle.lockfile") + lockAllConfigurations() + } +} + plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/complex_layout/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties index e1bef7e873c..7bb2df6ba6e 100644 --- a/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/complex_layout/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/benchmarks/complex_layout/android/settings.gradle b/dev/benchmarks/complex_layout/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/benchmarks/complex_layout/android/settings.gradle +++ b/dev/benchmarks/complex_layout/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile b/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/macrobenchmarks/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/benchmarks/macrobenchmarks/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/macrobenchmarks/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/benchmarks/macrobenchmarks/android/settings.gradle b/dev/benchmarks/macrobenchmarks/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/benchmarks/macrobenchmarks/android/settings.gradle +++ b/dev/benchmarks/macrobenchmarks/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile b/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/platform_views_layout/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/benchmarks/platform_views_layout/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/platform_views_layout/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/benchmarks/platform_views_layout/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/platform_views_layout/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/benchmarks/platform_views_layout/android/settings.gradle b/dev/benchmarks/platform_views_layout/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/benchmarks/platform_views_layout/android/settings.gradle +++ b/dev/benchmarks/platform_views_layout/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile b/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/platform_views_layout_hybrid_composition/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/platform_views_layout_hybrid_composition/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/benchmarks/platform_views_layout_hybrid_composition/android/settings.gradle b/dev/benchmarks/platform_views_layout_hybrid_composition/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/benchmarks/platform_views_layout_hybrid_composition/android/settings.gradle +++ b/dev/benchmarks/platform_views_layout_hybrid_composition/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile b/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile +++ b/dev/benchmarks/test_apps/stocks/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/benchmarks/test_apps/stocks/android/gradle/wrapper/gradle-wrapper.properties b/dev/benchmarks/test_apps/stocks/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/benchmarks/test_apps/stocks/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/benchmarks/test_apps/stocks/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/benchmarks/test_apps/stocks/android/settings.gradle b/dev/benchmarks/test_apps/stocks/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/benchmarks/test_apps/stocks/android/settings.gradle +++ b/dev/benchmarks/test_apps/stocks/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle b/dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle index b75709d82aa..3fc0256254f 100644 --- a/dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle +++ b/dev/integration_tests/abstract_method_smoke_test/android/app/build.gradle @@ -27,6 +27,7 @@ if (flutterVersionName == null) { } android { + namespace = "com.example.abstract_method_smoke_test" compileSdk flutter.compileSdkVersion compileOptions { diff --git a/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml index 5d7a7a12b62..6ca5d4667d5 100644 --- a/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml @@ -2,8 +2,7 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> - + - + - + - + diff --git a/dev/integration_tests/android_views/android/buildscript-gradle.lockfile b/dev/integration_tests/android_views/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/integration_tests/android_views/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/android_views/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/integration_tests/android_views/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/android_views/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/integration_tests/android_views/android/settings.gradle b/dev/integration_tests/android_views/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/integration_tests/android_views/android/settings.gradle +++ b/dev/integration_tests/android_views/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/integration_tests/channels/android/buildscript-gradle.lockfile b/dev/integration_tests/channels/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/integration_tests/channels/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/channels/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/integration_tests/channels/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/channels/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/integration_tests/channels/android/settings.gradle b/dev/integration_tests/channels/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/integration_tests/channels/android/settings.gradle +++ b/dev/integration_tests/channels/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/integration_tests/flavors/android/app/build.gradle b/dev/integration_tests/flavors/android/app/build.gradle index 803f54c8a4f..5b091f702ab 100644 --- a/dev/integration_tests/flavors/android/app/build.gradle +++ b/dev/integration_tests/flavors/android/app/build.gradle @@ -44,6 +44,9 @@ android { free {} paid {} } + buildFeatures { + buildConfig true + } } flutter { diff --git a/dev/integration_tests/flavors/android/buildscript-gradle.lockfile b/dev/integration_tests/flavors/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/integration_tests/flavors/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/flavors/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties index cb24abda10a..7bb2df6ba6e 100644 --- a/dev/integration_tests/flavors/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/flavors/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-7.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/integration_tests/flavors/android/settings.gradle b/dev/integration_tests/flavors/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/integration_tests/flavors/android/settings.gradle +++ b/dev/integration_tests/flavors/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/integration_tests/gradle_deprecated_settings/android/app/build.gradle b/dev/integration_tests/gradle_deprecated_settings/android/app/build.gradle index d751a901137..ecb2deeb6d4 100644 --- a/dev/integration_tests/gradle_deprecated_settings/android/app/build.gradle +++ b/dev/integration_tests/gradle_deprecated_settings/android/app/build.gradle @@ -19,6 +19,7 @@ apply plugin: 'com.android.application' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { + namespace = "com.yourcompany.flavors" compileSdk 34 compileOptions { diff --git a/dev/integration_tests/gradle_deprecated_settings/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/gradle_deprecated_settings/android/app/src/main/AndroidManifest.xml index a58598e2b4e..f3347e816af 100644 --- a/dev/integration_tests/gradle_deprecated_settings/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/gradle_deprecated_settings/android/app/src/main/AndroidManifest.xml @@ -2,8 +2,7 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> - + diff --git a/dev/integration_tests/gradle_deprecated_settings/android/build.gradle b/dev/integration_tests/gradle_deprecated_settings/android/build.gradle index ae58fff05fe..5fe992e3b15 100644 --- a/dev/integration_tests/gradle_deprecated_settings/android/build.gradle +++ b/dev/integration_tests/gradle_deprecated_settings/android/build.gradle @@ -13,7 +13,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:7.3.0' + classpath 'com.android.tools.build:gradle:8.1.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } diff --git a/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile b/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile index eb605802d98..d6db6e076aa 100644 --- a/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/gradle_deprecated_settings/android/buildscript-gradle.lockfile @@ -1,64 +1,67 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -69,25 +72,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -96,14 +99,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -123,28 +126,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/integration_tests/gradle_deprecated_settings/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/gradle_deprecated_settings/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/integration_tests/gradle_deprecated_settings/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/gradle_deprecated_settings/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/integration_tests/hybrid_android_views/android/app/build.gradle b/dev/integration_tests/hybrid_android_views/android/app/build.gradle index 8858c367a11..5fb0d47446d 100644 --- a/dev/integration_tests/hybrid_android_views/android/app/build.gradle +++ b/dev/integration_tests/hybrid_android_views/android/app/build.gradle @@ -26,6 +26,7 @@ if (flutterVersionName == null) { } android { + namespace = "io.flutter.integration.platformviews" compileSdk flutter.compileSdkVersion compileOptions { diff --git a/dev/integration_tests/hybrid_android_views/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/hybrid_android_views/android/app/src/main/AndroidManifest.xml index 925b1c4a1fa..66db29e84ab 100644 --- a/dev/integration_tests/hybrid_android_views/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/hybrid_android_views/android/app/src/main/AndroidManifest.xml @@ -2,8 +2,7 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> - + diff --git a/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile b/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile index 7e315389704..c4ae49fa772 100644 --- a/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile +++ b/dev/integration_tests/hybrid_android_views/android/buildscript-gradle.lockfile @@ -1,65 +1,68 @@ # 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:7.3.0=classpath -androidx.databinding:databinding-compiler-common:7.3.0=classpath -com.android.application:com.android.application.gradle.plugin:7.3.0=classpath -com.android.databinding:baseLibrary:7.3.0=classpath -com.android.tools.analytics-library:crash:30.3.0=classpath -com.android.tools.analytics-library:protos:30.3.0=classpath -com.android.tools.analytics-library:shared:30.3.0=classpath -com.android.tools.analytics-library:tracker:30.3.0=classpath +androidx.databinding:databinding-common:8.1.0=classpath +androidx.databinding:databinding-compiler-common:8.1.0=classpath +com.android.application:com.android.application.gradle.plugin:8.1.0=classpath +com.android.databinding:baseLibrary:8.1.0=classpath +com.android.tools.analytics-library:crash:31.1.0=classpath +com.android.tools.analytics-library:protos:31.1.0=classpath +com.android.tools.analytics-library:shared:31.1.0=classpath +com.android.tools.analytics-library:tracker:31.1.0=classpath com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath -com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath -com.android.tools.build:aaptcompiler:7.3.0=classpath -com.android.tools.build:apksig:7.3.0=classpath -com.android.tools.build:apkzlib:7.3.0=classpath -com.android.tools.build:builder-model:7.3.0=classpath -com.android.tools.build:builder-test-api:7.3.0=classpath -com.android.tools.build:builder:7.3.0=classpath -com.android.tools.build:bundletool:1.9.0=classpath -com.android.tools.build:gradle-api:7.3.0=classpath -com.android.tools.build:gradle:7.3.0=classpath -com.android.tools.build:manifest-merger:30.3.0=classpath +com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath +com.android.tools.build:aaptcompiler:8.1.0=classpath +com.android.tools.build:apksig:8.1.0=classpath +com.android.tools.build:apkzlib:8.1.0=classpath +com.android.tools.build:builder-model:8.1.0=classpath +com.android.tools.build:builder-test-api:8.1.0=classpath +com.android.tools.build:builder:8.1.0=classpath +com.android.tools.build:bundletool:1.14.0=classpath +com.android.tools.build:gradle-api:8.1.0=classpath +com.android.tools.build:gradle-settings-api:8.1.0=classpath +com.android.tools.build:gradle:8.1.0=classpath +com.android.tools.build:manifest-merger:31.1.0=classpath com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath -com.android.tools.ddms:ddmlib:30.3.0=classpath -com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath -com.android.tools.lint:lint-model:30.3.0=classpath -com.android.tools.lint:lint-typedef-remover:30.3.0=classpath -com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath -com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath -com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath -com.android.tools:annotations:30.3.0=classpath -com.android.tools:common:30.3.0=classpath -com.android.tools:dvlib:30.3.0=classpath -com.android.tools:repository:30.3.0=classpath -com.android.tools:sdk-common:30.3.0=classpath -com.android.tools:sdklib:30.3.0=classpath -com.android:signflinger:7.3.0=classpath -com.android:zipflinger:7.3.0=classpath +com.android.tools.ddms:ddmlib:31.1.0=classpath +com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath +com.android.tools.lint:lint-model:31.1.0=classpath +com.android.tools.lint:lint-typedef-remover:31.1.0=classpath +com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath +com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath +com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath +com.android.tools:annotations:31.1.0=classpath +com.android.tools:common:31.1.0=classpath +com.android.tools:dvlib:31.1.0=classpath +com.android.tools:repository:31.1.0=classpath +com.android.tools:sdk-common:31.1.0=classpath +com.android.tools:sdklib:31.1.0=classpath +com.android:signflinger:8.1.0=classpath +com.android:zipflinger:8.1.0=classpath com.github.gundy:semver4j:0.16.4=classpath com.google.android:annotations:4.1.1.4=classpath com.google.api.grpc:proto-google-common-protos:2.0.1=classpath com.google.auto.value:auto-value-annotations:1.6.2=classpath com.google.code.findbugs:jsr305:3.0.2=classpath com.google.code.gson:gson:2.8.9=classpath -com.google.crypto.tink:tink:1.3.0-rc2=classpath +com.google.crypto.tink:tink:1.7.0=classpath com.google.dagger:dagger:2.28.3=classpath -com.google.errorprone:error_prone_annotations:2.4.0=classpath +com.google.errorprone:error_prone_annotations:2.11.0=classpath com.google.flatbuffers:flatbuffers-java:1.12.0=classpath com.google.guava:failureaccess:1.0.1=classpath -com.google.guava:guava:30.1-jre=classpath +com.google.guava:guava:31.1-jre=classpath com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath com.google.j2objc:j2objc-annotations:1.3=classpath com.google.jimfs:jimfs:1.1=classpath -com.google.protobuf:protobuf-java-util:3.17.2=classpath -com.google.protobuf:protobuf-java:3.17.2=classpath -com.google.testing.platform:core-proto:0.0.8-alpha07=classpath -com.googlecode.json-simple:json-simple:1.1=classpath +com.google.protobuf:protobuf-java-util:3.19.3=classpath +com.google.protobuf:protobuf-java:3.19.3=classpath +com.google.testing.platform:core-proto:0.0.8-alpha08=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.squareup:javapoet:1.10.0=classpath com.squareup:javawriter:2.5.0=classpath @@ -70,25 +73,25 @@ commons-codec:commons-codec:1.11=classpath commons-io:commons-io:2.4=classpath commons-logging:commons-logging:1.2=classpath de.undercouch:gradle-download-task:4.1.1=classpath -io.grpc:grpc-api:1.39.0=classpath -io.grpc:grpc-context:1.39.0=classpath -io.grpc:grpc-core:1.39.0=classpath -io.grpc:grpc-netty:1.39.0=classpath -io.grpc:grpc-protobuf-lite:1.39.0=classpath -io.grpc:grpc-protobuf:1.39.0=classpath -io.grpc:grpc-stub:1.39.0=classpath -io.netty:netty-buffer:4.1.52.Final=classpath -io.netty:netty-codec-http2:4.1.52.Final=classpath -io.netty:netty-codec-http:4.1.52.Final=classpath -io.netty:netty-codec-socks:4.1.52.Final=classpath -io.netty:netty-codec:4.1.52.Final=classpath -io.netty:netty-common:4.1.52.Final=classpath -io.netty:netty-handler-proxy:4.1.52.Final=classpath -io.netty:netty-handler:4.1.52.Final=classpath -io.netty:netty-resolver:4.1.52.Final=classpath -io.netty:netty-transport:4.1.52.Final=classpath +io.grpc:grpc-api:1.45.1=classpath +io.grpc:grpc-context:1.45.1=classpath +io.grpc:grpc-core:1.45.1=classpath +io.grpc:grpc-netty:1.45.1=classpath +io.grpc:grpc-protobuf-lite:1.45.1=classpath +io.grpc:grpc-protobuf:1.45.1=classpath +io.grpc:grpc-stub:1.45.1=classpath +io.netty:netty-buffer:4.1.72.Final=classpath +io.netty:netty-codec-http2:4.1.72.Final=classpath +io.netty:netty-codec-http:4.1.72.Final=classpath +io.netty:netty-codec-socks:4.1.72.Final=classpath +io.netty:netty-codec:4.1.72.Final=classpath +io.netty:netty-common:4.1.72.Final=classpath +io.netty:netty-handler-proxy:4.1.72.Final=classpath +io.netty:netty-handler:4.1.72.Final=classpath +io.netty:netty-resolver:4.1.72.Final=classpath +io.netty:netty-tcnative-classes:2.0.46.Final=classpath +io.netty:netty-transport:4.1.72.Final=classpath io.perfmark:perfmark-api:0.23.0=classpath -it.unimi.dsi:fastutil:8.4.0=classpath jakarta.activation:jakarta.activation-api:1.2.1=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath @@ -97,14 +100,14 @@ net.java.dev.jna:jna-platform:5.6.0=classpath net.java.dev.jna:jna:5.6.0=classpath net.sf.jopt-simple:jopt-simple:4.9=classpath net.sf.kxml:kxml2:2.3.0=classpath -org.apache.commons:commons-compress:1.20=classpath +org.apache.commons:commons-compress:1.21=classpath org.apache.httpcomponents:httpclient:4.5.13=classpath -org.apache.httpcomponents:httpcore:4.4.13=classpath +org.apache.httpcomponents:httpcore:4.4.15=classpath org.apache.httpcomponents:httpmime:4.5.6=classpath org.bitbucket.b_c:jose4j:0.7.0=classpath org.bouncycastle:bcpkix-jdk15on:1.67=classpath org.bouncycastle:bcprov-jdk15on:1.67=classpath -org.checkerframework:checker-qual:3.5.0=classpath +org.checkerframework:checker-qual:3.12.0=classpath org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath org.glassfish.jaxb:txw2:2.3.2=classpath @@ -125,28 +128,27 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath -org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath +org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath -org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath -org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath +org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath +org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath org.jetbrains:annotations:13.0=classpath -org.json:json:20180813=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath -org.ow2.asm:asm-analysis:9.1=classpath -org.ow2.asm:asm-commons:9.1=classpath -org.ow2.asm:asm-tree:9.1=classpath -org.ow2.asm:asm-util:9.1=classpath -org.ow2.asm:asm:9.1=classpath +org.ow2.asm:asm-analysis:9.2=classpath +org.ow2.asm:asm-commons:9.2=classpath +org.ow2.asm:asm-tree:9.2=classpath +org.ow2.asm:asm-util:9.2=classpath +org.ow2.asm:asm:9.2=classpath org.slf4j:slf4j-api:1.7.30=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath xerces:xercesImpl:2.12.0=classpath diff --git a/dev/integration_tests/hybrid_android_views/android/gradle/wrapper/gradle-wrapper.properties b/dev/integration_tests/hybrid_android_views/android/gradle/wrapper/gradle-wrapper.properties index e1ca574ef01..7bb2df6ba6e 100644 --- a/dev/integration_tests/hybrid_android_views/android/gradle/wrapper/gradle-wrapper.properties +++ b/dev/integration_tests/hybrid_android_views/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-7.6.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip diff --git a/dev/integration_tests/hybrid_android_views/android/settings.gradle b/dev/integration_tests/hybrid_android_views/android/settings.gradle index 30db20e2606..73a4cf75b62 100644 --- a/dev/integration_tests/hybrid_android_views/android/settings.gradle +++ b/dev/integration_tests/hybrid_android_views/android/settings.gradle @@ -34,7 +34,7 @@ buildscript { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version "7.3.0" apply false + id "com.android.application" version "8.1.0" apply false id "org.jetbrains.kotlin.android" version "1.7.10" apply false } diff --git a/dev/integration_tests/non_nullable/android/app/build.gradle b/dev/integration_tests/non_nullable/android/app/build.gradle index 5ca4a0c15ea..45be794a1ac 100644 --- a/dev/integration_tests/non_nullable/android/app/build.gradle +++ b/dev/integration_tests/non_nullable/android/app/build.gradle @@ -27,6 +27,7 @@ if (flutterVersionName == null) { } android { + namespace = "com.example.non_nullable" compileSdk flutter.compileSdkVersion compileOptions { diff --git a/dev/integration_tests/non_nullable/android/app/src/main/AndroidManifest.xml b/dev/integration_tests/non_nullable/android/app/src/main/AndroidManifest.xml index 79c3580b343..c7e86c6ecbc 100644 --- a/dev/integration_tests/non_nullable/android/app/src/main/AndroidManifest.xml +++ b/dev/integration_tests/non_nullable/android/app/src/main/AndroidManifest.xml @@ -2,8 +2,7 @@ Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. --> - + - + - + - +