Skip to content

Commit 7a42ed7

Browse files
reidbakerreidbaker
authored
Update to valid build tools variant and update lockfiles (#125825)
flutter/flutter#125331
1 parent 6cbc11d commit 7a42ed7

4 files changed

Lines changed: 51 additions & 52 deletions

File tree

‎.ci.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ targets:
430430
[]
431431
432432
- name: Linux firebase_abstract_method_smoke_test
433-
bringup: true # Flaky https://github.com/flutter/flutter/issues/124691
433+
bringup: false
434434
recipe: firebaselab/firebaselab
435435
timeout: 60
436436
properties:

‎dev/integration_tests/abstract_method_smoke_test/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ buildscript {
1414
}
1515

1616
dependencies {
17-
classpath 'com.android.tools.build:gradle:7.3.0'
17+
classpath 'com.android.tools.build:gradle:7.4.2'
1818
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1919
}
2020

‎dev/integration_tests/abstract_method_smoke_test/android/buildscript-gradle.lockfile‎

Lines changed: 48 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,46 @@
11
# This is a Gradle generated file for dependency locking.
22
# Manual edits can break the build and are not advised.
33
# This file is expected to be part of source control.
4-
androidx.databinding:databinding-common:7.3.0=classpath
5-
androidx.databinding:databinding-compiler-common:7.3.0=classpath
6-
com.android.databinding:baseLibrary:7.3.0=classpath
7-
com.android.tools.analytics-library:crash:30.3.0=classpath
8-
com.android.tools.analytics-library:protos:30.3.0=classpath
9-
com.android.tools.analytics-library:shared:30.3.0=classpath
10-
com.android.tools.analytics-library:tracker:30.3.0=classpath
4+
androidx.databinding:databinding-common:7.4.2=classpath
5+
androidx.databinding:databinding-compiler-common:7.4.2=classpath
6+
com.android.databinding:baseLibrary:7.4.2=classpath
7+
com.android.tools.analytics-library:crash:30.4.2=classpath
8+
com.android.tools.analytics-library:protos:30.4.2=classpath
9+
com.android.tools.analytics-library:shared:30.4.2=classpath
10+
com.android.tools.analytics-library:tracker:30.4.2=classpath
1111
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath
1212
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath
13-
com.android.tools.build:aapt2-proto:7.3.0-8691043=classpath
14-
com.android.tools.build:aaptcompiler:7.3.0=classpath
15-
com.android.tools.build:apksig:7.3.0=classpath
16-
com.android.tools.build:apkzlib:7.3.0=classpath
17-
com.android.tools.build:builder-model:7.3.0=classpath
18-
com.android.tools.build:builder-test-api:7.3.0=classpath
19-
com.android.tools.build:builder:7.3.0=classpath
20-
com.android.tools.build:bundletool:1.9.0=classpath
21-
com.android.tools.build:gradle-api:7.3.0=classpath
22-
com.android.tools.build:gradle:7.3.0=classpath
23-
com.android.tools.build:manifest-merger:30.3.0=classpath
13+
com.android.tools.build:aapt2-proto:7.4.2-8841542=classpath
14+
com.android.tools.build:aaptcompiler:7.4.2=classpath
15+
com.android.tools.build:apksig:7.4.2=classpath
16+
com.android.tools.build:apkzlib:7.4.2=classpath
17+
com.android.tools.build:builder-model:7.4.2=classpath
18+
com.android.tools.build:builder-test-api:7.4.2=classpath
19+
com.android.tools.build:builder:7.4.2=classpath
20+
com.android.tools.build:bundletool:1.11.4=classpath
21+
com.android.tools.build:gradle-api:7.4.2=classpath
22+
com.android.tools.build:gradle-settings-api:7.4.2=classpath
23+
com.android.tools.build:gradle:7.4.2=classpath
24+
com.android.tools.build:manifest-merger:30.4.2=classpath
2425
com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
25-
com.android.tools.ddms:ddmlib:30.3.0=classpath
26-
com.android.tools.layoutlib:layoutlib-api:30.3.0=classpath
27-
com.android.tools.lint:lint-model:30.3.0=classpath
28-
com.android.tools.lint:lint-typedef-remover:30.3.0=classpath
29-
com.android.tools.utp:android-device-provider-ddmlib-proto:30.3.0=classpath
30-
com.android.tools.utp:android-device-provider-gradle-proto:30.3.0=classpath
31-
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.3.0=classpath
32-
com.android.tools.utp:android-test-plugin-host-coverage-proto:30.3.0=classpath
33-
com.android.tools.utp:android-test-plugin-host-retention-proto:30.3.0=classpath
34-
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.3.0=classpath
35-
com.android.tools:annotations:30.3.0=classpath
36-
com.android.tools:common:30.3.0=classpath
37-
com.android.tools:dvlib:30.3.0=classpath
38-
com.android.tools:repository:30.3.0=classpath
39-
com.android.tools:sdk-common:30.3.0=classpath
40-
com.android.tools:sdklib:30.3.0=classpath
41-
com.android:signflinger:7.3.0=classpath
42-
com.android:zipflinger:7.3.0=classpath
26+
com.android.tools.ddms:ddmlib:30.4.2=classpath
27+
com.android.tools.layoutlib:layoutlib-api:30.4.2=classpath
28+
com.android.tools.lint:lint-model:30.4.2=classpath
29+
com.android.tools.lint:lint-typedef-remover:30.4.2=classpath
30+
com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.2=classpath
31+
com.android.tools.utp:android-device-provider-gradle-proto:30.4.2=classpath
32+
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.2=classpath
33+
com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.2=classpath
34+
com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.2=classpath
35+
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.2=classpath
36+
com.android.tools:annotations:30.4.2=classpath
37+
com.android.tools:common:30.4.2=classpath
38+
com.android.tools:dvlib:30.4.2=classpath
39+
com.android.tools:repository:30.4.2=classpath
40+
com.android.tools:sdk-common:30.4.2=classpath
41+
com.android.tools:sdklib:30.4.2=classpath
42+
com.android:signflinger:7.4.2=classpath
43+
com.android:zipflinger:7.4.2=classpath
4344
com.github.gundy:semver4j:0.16.4=classpath
4445
com.google.android:annotations:4.1.1.4=classpath
4546
com.google.api.grpc:proto-google-common-protos:2.0.1=classpath
@@ -57,8 +58,7 @@ com.google.j2objc:j2objc-annotations:1.3=classpath
5758
com.google.jimfs:jimfs:1.1=classpath
5859
com.google.protobuf:protobuf-java-util:3.17.2=classpath
5960
com.google.protobuf:protobuf-java:3.17.2=classpath
60-
com.google.testing.platform:core-proto:0.0.8-alpha07=classpath
61-
com.googlecode.json-simple:json-simple:1.1=classpath
61+
com.google.testing.platform:core-proto:0.0.8-alpha08=classpath
6262
com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
6363
com.squareup:javapoet:1.10.0=classpath
6464
com.squareup:javawriter:2.5.0=classpath
@@ -87,7 +87,6 @@ io.netty:netty-handler:4.1.52.Final=classpath
8787
io.netty:netty-resolver:4.1.52.Final=classpath
8888
io.netty:netty-transport:4.1.52.Final=classpath
8989
io.perfmark:perfmark-api:0.23.0=classpath
90-
it.unimi.dsi:fastutil:8.4.0=classpath
9190
jakarta.activation:jakarta.activation-api:1.2.1=classpath
9291
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
9392
javax.annotation:javax.annotation-api:1.3.2=classpath
@@ -123,15 +122,15 @@ org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath
123122
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath
124123
org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath
125124
org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath
126-
org.jetbrains.kotlin:kotlin-reflect:1.5.31=classpath
125+
org.jetbrains.kotlin:kotlin-reflect:1.7.10=classpath
127126
org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath
128127
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath
129128
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath
130129
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath
131-
org.jetbrains.kotlin:kotlin-stdlib-common:1.5.31=classpath
132-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.5.31=classpath
133-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.5.31=classpath
134-
org.jetbrains.kotlin:kotlin-stdlib:1.5.31=classpath
130+
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
131+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
132+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
133+
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
135134
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath
136135
org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath
137136
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
140139
org.jetbrains:annotations:13.0=classpath
141140
org.json:json:20180813=classpath
142141
org.jvnet.staxex:stax-ex:1.8.1=classpath
143-
org.ow2.asm:asm-analysis:9.1=classpath
144-
org.ow2.asm:asm-commons:9.1=classpath
145-
org.ow2.asm:asm-tree:9.1=classpath
146-
org.ow2.asm:asm-util:9.1=classpath
147-
org.ow2.asm:asm:9.1=classpath
142+
org.ow2.asm:asm-analysis:9.2=classpath
143+
org.ow2.asm:asm-commons:9.2=classpath
144+
org.ow2.asm:asm-tree:9.2=classpath
145+
org.ow2.asm:asm-util:9.2=classpath
146+
org.ow2.asm:asm:9.2=classpath
148147
org.slf4j:slf4j-api:1.7.30=classpath
149148
org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
150149
xerces:xercesImpl:2.12.0=classpath

‎dev/integration_tests/abstract_method_smoke_test/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip

0 commit comments

Comments
 (0)