Skip to content

Commit 22e0c89

Browse files
authored
Reland "Bump to AGP 8.1/Gradle 8.3 (almost) everywhere" (#146307)
Relands flutter/flutter#146181. Just 3 commits: 1. a revert of the revert 2. the fix described in flutter/flutter#146181 (comment) 3. updating two postsubmit tests from Java 11 to 17, as that is required for this new AGP version. I've verified that `flutter build apk --flavor paid --debug` fails in `dev/integration_tests/flavors/` with the error in ci without (2), and succeeds with it. I've also verified that the `dev/benchmarks/complex_layout` app builds successfully with Java 17. That covers all the postsubmits that failed according [to the dashboard](https://flutter-dashboard.appspot.com/#/build).
1 parent 643848a commit 22e0c89

File tree

106 files changed

+2391
-2013
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+2391
-2013
lines changed

.ci.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2249,7 +2249,7 @@ targets:
22492249
task_name: complex_layout_scroll_perf_impeller__timeline_summary
22502250
dependencies: >-
22512251
[
2252-
{"dependency": "open_jdk", "version": "version:11"}
2252+
{"dependency": "open_jdk", "version": "version:17"}
22532253
]
22542254
22552255
- name: Linux_pixel_7pro complex_layout_scroll_perf_impeller_gles__timeline_summary
@@ -2262,7 +2262,7 @@ targets:
22622262
task_name: complex_layout_scroll_perf_impeller_gles__timeline_summary
22632263
dependencies: >-
22642264
[
2265-
{"dependency": "open_jdk", "version": "version:11"}
2265+
{"dependency": "open_jdk", "version": "version:17"}
22662266
]
22672267
22682268
# linux motog4 benchmark
Lines changed: 156 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,156 @@
1+
# This is a Gradle generated file for dependency locking.
2+
# Manual edits can break the build and are not advised.
3+
# This file is expected to be part of source control.
4+
androidx.databinding:databinding-common:8.1.0=classpath
5+
androidx.databinding:databinding-compiler-common:8.1.0=classpath
6+
com.android.application:com.android.application.gradle.plugin:8.1.0=classpath
7+
com.android.databinding:baseLibrary:8.1.0=classpath
8+
com.android.tools.analytics-library:crash:31.1.0=classpath
9+
com.android.tools.analytics-library:protos:31.1.0=classpath
10+
com.android.tools.analytics-library:shared:31.1.0=classpath
11+
com.android.tools.analytics-library:tracker:31.1.0=classpath
12+
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath
13+
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath
14+
com.android.tools.build:aapt2-proto:8.1.0-10154469=classpath
15+
com.android.tools.build:aaptcompiler:8.1.0=classpath
16+
com.android.tools.build:apksig:8.1.0=classpath
17+
com.android.tools.build:apkzlib:8.1.0=classpath
18+
com.android.tools.build:builder-model:8.1.0=classpath
19+
com.android.tools.build:builder-test-api:8.1.0=classpath
20+
com.android.tools.build:builder:8.1.0=classpath
21+
com.android.tools.build:bundletool:1.14.0=classpath
22+
com.android.tools.build:gradle-api:8.1.0=classpath
23+
com.android.tools.build:gradle-settings-api:8.1.0=classpath
24+
com.android.tools.build:gradle:8.1.0=classpath
25+
com.android.tools.build:manifest-merger:31.1.0=classpath
26+
com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
27+
com.android.tools.ddms:ddmlib:31.1.0=classpath
28+
com.android.tools.layoutlib:layoutlib-api:31.1.0=classpath
29+
com.android.tools.lint:lint-model:31.1.0=classpath
30+
com.android.tools.lint:lint-typedef-remover:31.1.0=classpath
31+
com.android.tools.utp:android-device-provider-ddmlib-proto:31.1.0=classpath
32+
com.android.tools.utp:android-device-provider-gradle-proto:31.1.0=classpath
33+
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:31.1.0=classpath
34+
com.android.tools.utp:android-test-plugin-host-apk-installer-proto:31.1.0=classpath
35+
com.android.tools.utp:android-test-plugin-host-coverage-proto:31.1.0=classpath
36+
com.android.tools.utp:android-test-plugin-host-emulator-control-proto:31.1.0=classpath
37+
com.android.tools.utp:android-test-plugin-host-logcat-proto:31.1.0=classpath
38+
com.android.tools.utp:android-test-plugin-host-retention-proto:31.1.0=classpath
39+
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:31.1.0=classpath
40+
com.android.tools:annotations:31.1.0=classpath
41+
com.android.tools:common:31.1.0=classpath
42+
com.android.tools:dvlib:31.1.0=classpath
43+
com.android.tools:repository:31.1.0=classpath
44+
com.android.tools:sdk-common:31.1.0=classpath
45+
com.android.tools:sdklib:31.1.0=classpath
46+
com.android:signflinger:8.1.0=classpath
47+
com.android:zipflinger:8.1.0=classpath
48+
com.github.gundy:semver4j:0.16.4=classpath
49+
com.google.android:annotations:4.1.1.4=classpath
50+
com.google.api.grpc:proto-google-common-protos:2.0.1=classpath
51+
com.google.auto.value:auto-value-annotations:1.6.2=classpath
52+
com.google.code.findbugs:jsr305:3.0.2=classpath
53+
com.google.code.gson:gson:2.8.9=classpath
54+
com.google.crypto.tink:tink:1.7.0=classpath
55+
com.google.dagger:dagger:2.28.3=classpath
56+
com.google.errorprone:error_prone_annotations:2.11.0=classpath
57+
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
58+
com.google.guava:failureaccess:1.0.1=classpath
59+
com.google.guava:guava:31.1-jre=classpath
60+
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
61+
com.google.j2objc:j2objc-annotations:1.3=classpath
62+
com.google.jimfs:jimfs:1.1=classpath
63+
com.google.protobuf:protobuf-java-util:3.19.3=classpath
64+
com.google.protobuf:protobuf-java:3.19.3=classpath
65+
com.google.testing.platform:core-proto:0.0.8-alpha08=classpath
66+
com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
67+
com.squareup:javapoet:1.10.0=classpath
68+
com.squareup:javawriter:2.5.0=classpath
69+
com.sun.activation:javax.activation:1.2.0=classpath
70+
com.sun.istack:istack-commons-runtime:3.0.8=classpath
71+
com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
72+
commons-codec:commons-codec:1.11=classpath
73+
commons-io:commons-io:2.4=classpath
74+
commons-logging:commons-logging:1.2=classpath
75+
de.undercouch:gradle-download-task:4.1.1=classpath
76+
io.grpc:grpc-api:1.45.1=classpath
77+
io.grpc:grpc-context:1.45.1=classpath
78+
io.grpc:grpc-core:1.45.1=classpath
79+
io.grpc:grpc-netty:1.45.1=classpath
80+
io.grpc:grpc-protobuf-lite:1.45.1=classpath
81+
io.grpc:grpc-protobuf:1.45.1=classpath
82+
io.grpc:grpc-stub:1.45.1=classpath
83+
io.netty:netty-buffer:4.1.72.Final=classpath
84+
io.netty:netty-codec-http2:4.1.72.Final=classpath
85+
io.netty:netty-codec-http:4.1.72.Final=classpath
86+
io.netty:netty-codec-socks:4.1.72.Final=classpath
87+
io.netty:netty-codec:4.1.72.Final=classpath
88+
io.netty:netty-common:4.1.72.Final=classpath
89+
io.netty:netty-handler-proxy:4.1.72.Final=classpath
90+
io.netty:netty-handler:4.1.72.Final=classpath
91+
io.netty:netty-resolver:4.1.72.Final=classpath
92+
io.netty:netty-tcnative-classes:2.0.46.Final=classpath
93+
io.netty:netty-transport:4.1.72.Final=classpath
94+
io.perfmark:perfmark-api:0.23.0=classpath
95+
jakarta.activation:jakarta.activation-api:1.2.1=classpath
96+
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
97+
javax.annotation:javax.annotation-api:1.3.2=classpath
98+
javax.inject:javax.inject:1=classpath
99+
net.java.dev.jna:jna-platform:5.6.0=classpath
100+
net.java.dev.jna:jna:5.6.0=classpath
101+
net.sf.jopt-simple:jopt-simple:4.9=classpath
102+
net.sf.kxml:kxml2:2.3.0=classpath
103+
org.apache.commons:commons-compress:1.21=classpath
104+
org.apache.httpcomponents:httpclient:4.5.13=classpath
105+
org.apache.httpcomponents:httpcore:4.4.15=classpath
106+
org.apache.httpcomponents:httpmime:4.5.6=classpath
107+
org.bitbucket.b_c:jose4j:0.7.0=classpath
108+
org.bouncycastle:bcpkix-jdk15on:1.67=classpath
109+
org.bouncycastle:bcprov-jdk15on:1.67=classpath
110+
org.checkerframework:checker-qual:3.12.0=classpath
111+
org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath
112+
org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
113+
org.glassfish.jaxb:txw2:2.3.2=classpath
114+
org.jdom:jdom2:2.0.6=classpath
115+
org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
116+
org.jetbrains.kotlin.android:org.jetbrains.kotlin.android.gradle.plugin:1.7.10=classpath
117+
org.jetbrains.kotlin:kotlin-android-extensions:1.7.10=classpath
118+
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.7.10=classpath
119+
org.jetbrains.kotlin:kotlin-build-common:1.7.10=classpath
120+
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.7.10=classpath
121+
org.jetbrains.kotlin:kotlin-compiler-runner:1.7.10=classpath
122+
org.jetbrains.kotlin:kotlin-daemon-client:1.7.10=classpath
123+
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.7.10=classpath
124+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.7.10=classpath
125+
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.7.10=classpath
126+
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.7.10=classpath
127+
org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10=classpath
128+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.7.10=classpath
129+
org.jetbrains.kotlin:kotlin-native-utils:1.7.10=classpath
130+
org.jetbrains.kotlin:kotlin-project-model:1.7.10=classpath
131+
org.jetbrains.kotlin:kotlin-reflect:1.8.20-RC2=classpath
132+
org.jetbrains.kotlin:kotlin-scripting-common:1.7.10=classpath
133+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.7.10=classpath
134+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.7.10=classpath
135+
org.jetbrains.kotlin:kotlin-scripting-jvm:1.7.10=classpath
136+
org.jetbrains.kotlin:kotlin-stdlib-common:1.8.20-RC2=classpath
137+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.20-RC2=classpath
138+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.20-RC2=classpath
139+
org.jetbrains.kotlin:kotlin-stdlib:1.8.20-RC2=classpath
140+
org.jetbrains.kotlin:kotlin-tooling-core:1.7.10=classpath
141+
org.jetbrains.kotlin:kotlin-tooling-metadata:1.7.10=classpath
142+
org.jetbrains.kotlin:kotlin-util-io:1.7.10=classpath
143+
org.jetbrains.kotlin:kotlin-util-klib:1.7.10=classpath
144+
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
145+
org.jetbrains:annotations:13.0=classpath
146+
org.jvnet.staxex:stax-ex:1.8.1=classpath
147+
org.ow2.asm:asm-analysis:9.2=classpath
148+
org.ow2.asm:asm-commons:9.2=classpath
149+
org.ow2.asm:asm-tree:9.2=classpath
150+
org.ow2.asm:asm-util:9.2=classpath
151+
org.ow2.asm:asm:9.2=classpath
152+
org.slf4j:slf4j-api:1.7.30=classpath
153+
org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
154+
xerces:xercesImpl:2.12.0=classpath
155+
xml-apis:xml-apis:1.4.01=classpath
156+
empty=

dev/a11y_assessments/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.6.3-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip

dev/a11y_assessments/android/settings.gradle

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,16 @@ pluginManagement {
2525
}
2626
}
2727

28+
buildscript {
29+
dependencyLocking {
30+
lockFile = file("${rootProject.projectDir}/buildscript-gradle.lockfile")
31+
lockAllConfigurations()
32+
}
33+
}
34+
2835
plugins {
2936
id "dev.flutter.flutter-plugin-loader" version "1.0.0"
30-
id "com.android.application" version "7.3.0" apply false
37+
id "com.android.application" version "8.1.0" apply false
3138
id "org.jetbrains.kotlin.android" version "1.7.10" apply false
3239
}
3340

0 commit comments

Comments
 (0)