firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to valid build tools variant and update lockfiles (#125825)

Browse Source 
https://github.com/flutter/flutter/issues/125331
This commit is contained in:
Reid Baker 2023-07-17 08:57:08 -07:00 committed by GitHub
parent 6cbc11d63f
commit 7a42ed7ef6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 51 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.ci.yaml
View File

@ -430,7 +430,7 @@ targets:
[] []
- name: Linux firebase_abstract_method_smoke_test - name: Linux firebase_abstract_method_smoke_test
bringup: true # Flaky https://github.com/flutter/flutter/issues/124691 bringup: false
recipe: firebaselab/firebaselab recipe: firebaselab/firebaselab
timeout: 60 timeout: 60
properties: properties:

2
dev/integration_tests/abstract_method_smoke_test/android/build.gradle
View File

@ -14,7 +14,7 @@ buildscript {
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.3.0' classpath 'com.android.tools.build:gradle:7.4.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
} }

97
dev/integration_tests/abstract_method_smoke_test/android/buildscript-gradle.lockfile
View File

@ -1,45 +1,46 @@
# This is a Gradle generated file for dependency locking. # This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised. # Manual edits can break the build and are not advised.
# This file is expected to be part of source control. # This file is expected to be part of source control.
androidx.databinding:databinding-common:7.3.0=classpath androidx.databinding:databinding-common:7.4.2=classpath
androidx.databinding:databinding-compiler-common:7.3.0=classpath androidx.databinding:databinding-compiler-common:7.4.2=classpath
com.android.databinding:baseLibrary:7.3.0=classpath com.android.databinding:baseLibrary:7.4.2=classpath
com.android.tools.analytics-library:crash:30.3.0=classpath com.android.tools.analytics-library:crash:30.4.2=classpath
com.android.tools.analytics-library:protos:30.3.0=classpath com.android.tools.analytics-library:protos:30.4.2=classpath
com.android.tools.analytics-library:shared:30.3.0=classpath com.android.tools.analytics-library:shared:30.4.2=classpath
com.android.tools.analytics-library:tracker:30.3.0=classpath com.android.tools.analytics-library:tracker:30.4.2=classpath
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=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.jetifier:jetifier-processor:1.0.0-beta10=classpath
com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath com.android.tools.build:aapt2-proto:7.4.2-8841542=classpath
com.android.tools.build:aaptcompiler:7.3.0=classpath com.android.tools.build:aaptcompiler:7.4.2=classpath
com.android.tools.build:apksig:7.3.0=classpath com.android.tools.build:apksig:7.4.2=classpath
com.android.tools.build:apkzlib:7.3.0=classpath com.android.tools.build:apkzlib:7.4.2=classpath
com.android.tools.build:builder-model:7.3.0=classpath com.android.tools.build:builder-model:7.4.2=classpath
com.android.tools.build:builder-test-api:7.3.0=classpath com.android.tools.build:builder-test-api:7.4.2=classpath
com.android.tools.build:builder:7.3.0=classpath com.android.tools.build:builder:7.4.2=classpath
com.android.tools.build:bundletool:1.9.0=classpath com.android.tools.build:bundletool:1.11.4=classpath
com.android.tools.build:gradle-api:7.3.0=classpath com.android.tools.build:gradle-api:7.4.2=classpath
com.android.tools.build:gradle:7.3.0=classpath com.android.tools.build:gradle-settings-api:7.4.2=classpath
com.android.tools.build:manifest-merger:30.3.0=classpath com.android.tools.build:gradle:7.4.2=classpath
com.android.tools.build:manifest-merger:30.4.2=classpath
com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=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.ddms:ddmlib:30.4.2=classpath
com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath com.android.tools.layoutlib:layoutlib-api:30.4.2=classpath
com.android.tools.lint:lint-model:30.3.0=classpath com.android.tools.lint:lint-model:30.4.2=classpath
com.android.tools.lint:lint-typedef-remover:30.3.0=classpath com.android.tools.lint:lint-typedef-remover:30.4.2=classpath
com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2=classpath
com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath com.android.tools.utp:android-device-provider-gradle-proto:30.4.2=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-additional-test-output-proto:30.4.2=classpath
com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2=classpath
com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2=classpath
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2=classpath
com.android.tools:annotations:30.3.0=classpath com.android.tools:annotations:30.4.2=classpath
com.android.tools:common:30.3.0=classpath com.android.tools:common:30.4.2=classpath
com.android.tools:dvlib:30.3.0=classpath com.android.tools:dvlib:30.4.2=classpath
com.android.tools:repository:30.3.0=classpath com.android.tools:repository:30.4.2=classpath
com.android.tools:sdk-common:30.3.0=classpath com.android.tools:sdk-common:30.4.2=classpath
com.android.tools:sdklib:30.3.0=classpath com.android.tools:sdklib:30.4.2=classpath
com.android:signflinger:7.3.0=classpath com.android:signflinger:7.4.2=classpath
com.android:zipflinger:7.3.0=classpath com.android:zipflinger:7.4.2=classpath
com.github.gundy:semver4j:0.16.4=classpath com.github.gundy:semver4j:0.16.4=classpath
com.google.android:annotations:4.1.1.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.api.grpc:proto-google-common-protos:2.0.1=classpath
@ -57,8 +58,7 @@ com.google.j2objc:j2objc-annotations:1.3=classpath
com.google.jimfs:jimfs:1.1=classpath com.google.jimfs:jimfs:1.1=classpath
com.google.protobuf:protobuf-java-util:3.17.2=classpath com.google.protobuf:protobuf-java-util:3.17.2=classpath
com.google.protobuf:protobuf-java: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.google.testing.platform:core-proto:0.0.8-alpha08=classpath
com.googlecode.json-simple:json-simple:1.1=classpath
com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
com.squareup:javapoet:1.10.0=classpath com.squareup:javapoet:1.10.0=classpath
com.squareup:javawriter:2.5.0=classpath com.squareup:javawriter:2.5.0=classpath
@ -87,7 +87,6 @@ io.netty:netty-handler:4.1.52.Final=classpath
io.netty:netty-resolver:4.1.52.Final=classpath io.netty:netty-resolver:4.1.52.Final=classpath
io.netty:netty-transport:4.1.52.Final=classpath io.netty:netty-transport:4.1.52.Final=classpath
io.perfmark:perfmark-api:0.23.0=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.activation:jakarta.activation-api:1.2.1=classpath
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
javax.annotation:javax.annotation-api:1.3.2=classpath javax.annotation:javax.annotation-api:1.3.2=classpath
@ -123,15 +122,15 @@ 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-klib-commonizer-api:1.7.10=classpath
org.jetbrains.kotlin:kotlin-native-utils: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-project-model:1.7.10=classpath
org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath org.jetbrains.kotlin:kotlin-reflect:1.7.10=classpath
org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=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-embeddable:1.7.10=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-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-scripting-jvm:1.7.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=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-tooling-metadata:1.7.10=classpath
org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath
@ -140,11 +139,11 @@ org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
org.jetbrains:annotations:13.0=classpath org.jetbrains:annotations:13.0=classpath
org.json:json:20180813=classpath org.json:json:20180813=classpath
org.jvnet.staxex:stax-ex:1.8.1=classpath org.jvnet.staxex:stax-ex:1.8.1=classpath
org.ow2.asm:asm-analysis:9.1=classpath org.ow2.asm:asm-analysis:9.2=classpath
org.ow2.asm:asm-commons:9.1=classpath org.ow2.asm:asm-commons:9.2=classpath
org.ow2.asm:asm-tree:9.1=classpath org.ow2.asm:asm-tree:9.2=classpath
org.ow2.asm:asm-util:9.1=classpath org.ow2.asm:asm-util:9.2=classpath
org.ow2.asm:asm:9.1=classpath org.ow2.asm:asm:9.2=classpath
org.slf4j:slf4j-api:1.7.30=classpath org.slf4j:slf4j-api:1.7.30=classpath
org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
xerces:xercesImpl:2.12.0=classpath xerces:xercesImpl:2.12.0=classpath

2
dev/integration_tests/abstract_method_smoke_test/android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip