Skip to content

Commit 6459135

Browse files
authored
i125138 abstract method smoke agp update (#125139)
- Update gradle and AGP version for abstract_method_smoke_test #125138 part 1/N To update successfully: 1. Update gradle to a version supported by jdk 17 2. Uncommented the lockfile lines in android/build.gradle 3. Then ran the AGP update assistant from AndroidStudio -> tools 4. From android ran `./gradlew dependencies --write-locks` 5. From android/app ran `./gradlew dependencies --write-locks` 6. Re enabled the lockfiles section of android/build.gradle 7. Ensured `flutter build apk` passed
1 parent 9f2e708 commit 6459135

File tree

5 files changed

+148
-106
lines changed

5 files changed

+148
-106
lines changed

dev/integration_tests/abstract_method_smoke_test/android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ found in the LICENSE file. -->
1818
android:theme="@style/LaunchTheme"
1919
android:configChanges="orientation|keyboardHidden|keyboard|screenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
2020
android:hardwareAccelerated="true"
21+
android:exported="true"
2122
android:windowSoftInputMode="stateVisible|adjustResize">
2223
<intent-filter>
2324
<action android:name="android.intent.action.MAIN"/>

dev/integration_tests/abstract_method_smoke_test/android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
// See dev/tools/bin/generate_gradle_lockfiles.dart.
88

99
buildscript {
10-
ext.kotlin_version = '1.5.31'
10+
ext.kotlin_version = '1.6.21'
1111
repositories {
1212
google()
1313
mavenCentral()
1414
}
1515

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

Lines changed: 120 additions & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,149 @@
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:4.1.3=classpath
5-
androidx.databinding:databinding-compiler-common:4.1.3=classpath
6-
com.android.databinding:baseLibrary:4.1.3=classpath
7-
com.android.tools.analytics-library:crash:27.1.3=classpath
8-
com.android.tools.analytics-library:protos:27.1.3=classpath
9-
com.android.tools.analytics-library:shared:27.1.3=classpath
10-
com.android.tools.analytics-library:tracker:27.1.3=classpath
11-
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta09=classpath
12-
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta09=classpath
13-
com.android.tools.build:aapt2-proto:4.1.3-6503028=classpath
14-
com.android.tools.build:aaptcompiler:4.1.3=classpath
15-
com.android.tools.build:apksig:4.1.3=classpath
16-
com.android.tools.build:apkzlib:4.1.3=classpath
17-
com.android.tools.build:builder-model:4.1.3=classpath
18-
com.android.tools.build:builder-test-api:4.1.3=classpath
19-
com.android.tools.build:builder:4.1.3=classpath
20-
com.android.tools.build:bundletool:0.14.0=classpath
21-
com.android.tools.build:gradle-api:4.1.3=classpath
22-
com.android.tools.build:gradle:4.1.3=classpath
23-
com.android.tools.build:manifest-merger:27.1.3=classpath
4+
androidx.databinding:databinding-common:7.4.1=classpath
5+
androidx.databinding:databinding-compiler-common:7.4.1=classpath
6+
com.android.databinding:baseLibrary:7.4.1=classpath
7+
com.android.tools.analytics-library:crash:30.4.1=classpath
8+
com.android.tools.analytics-library:protos:30.4.1=classpath
9+
com.android.tools.analytics-library:shared:30.4.1=classpath
10+
com.android.tools.analytics-library:tracker:30.4.1=classpath
11+
com.android.tools.build.jetifier:jetifier-core:1.0.0-beta10=classpath
12+
com.android.tools.build.jetifier:jetifier-processor:1.0.0-beta10=classpath
13+
com.android.tools.build:aapt2-proto:7.4.1-8841542=classpath
14+
com.android.tools.build:aaptcompiler:7.4.1=classpath
15+
com.android.tools.build:apksig:7.4.1=classpath
16+
com.android.tools.build:apkzlib:7.4.1=classpath
17+
com.android.tools.build:builder-model:7.4.1=classpath
18+
com.android.tools.build:builder-test-api:7.4.1=classpath
19+
com.android.tools.build:builder:7.4.1=classpath
20+
com.android.tools.build:bundletool:1.11.4=classpath
21+
com.android.tools.build:gradle-api:7.4.1=classpath
22+
com.android.tools.build:gradle-settings-api:7.4.1=classpath
23+
com.android.tools.build:gradle:7.4.1=classpath
24+
com.android.tools.build:manifest-merger:30.4.1=classpath
2425
com.android.tools.build:transform-api:2.0.0-deprecated-use-gradle-api=classpath
25-
com.android.tools.ddms:ddmlib:27.1.3=classpath
26-
com.android.tools.layoutlib:layoutlib-api:27.1.3=classpath
27-
com.android.tools.lint:lint-gradle-api:27.1.3=classpath
28-
com.android.tools.lint:lint-model:27.1.3=classpath
29-
com.android.tools:annotations:27.1.3=classpath
30-
com.android.tools:common:27.1.3=classpath
31-
com.android.tools:dvlib:27.1.3=classpath
32-
com.android.tools:repository:27.1.3=classpath
33-
com.android.tools:sdk-common:27.1.3=classpath
34-
com.android.tools:sdklib:27.1.3=classpath
35-
com.android:signflinger:4.1.3=classpath
36-
com.android:zipflinger:4.1.3=classpath
26+
com.android.tools.ddms:ddmlib:30.4.1=classpath
27+
com.android.tools.layoutlib:layoutlib-api:30.4.1=classpath
28+
com.android.tools.lint:lint-model:30.4.1=classpath
29+
com.android.tools.lint:lint-typedef-remover:30.4.1=classpath
30+
com.android.tools.utp:android-device-provider-ddmlib-proto:30.4.1=classpath
31+
com.android.tools.utp:android-device-provider-gradle-proto:30.4.1=classpath
32+
com.android.tools.utp:android-test-plugin-host-additional-test-output-proto:30.4.1=classpath
33+
com.android.tools.utp:android-test-plugin-host-coverage-proto:30.4.1=classpath
34+
com.android.tools.utp:android-test-plugin-host-retention-proto:30.4.1=classpath
35+
com.android.tools.utp:android-test-plugin-result-listener-gradle-proto:30.4.1=classpath
36+
com.android.tools:annotations:30.4.1=classpath
37+
com.android.tools:common:30.4.1=classpath
38+
com.android.tools:dvlib:30.4.1=classpath
39+
com.android.tools:repository:30.4.1=classpath
40+
com.android.tools:sdk-common:30.4.1=classpath
41+
com.android.tools:sdklib:30.4.1=classpath
42+
com.android:signflinger:7.4.1=classpath
43+
com.android:zipflinger:7.4.1=classpath
3744
com.github.gundy:semver4j:0.16.4=classpath
45+
com.google.android:annotations:4.1.1.4=classpath
46+
com.google.api.grpc:proto-google-common-protos:2.0.1=classpath
3847
com.google.auto.value:auto-value-annotations:1.6.2=classpath
3948
com.google.code.findbugs:jsr305:3.0.2=classpath
40-
com.google.code.gson:gson:2.8.6=classpath
49+
com.google.code.gson:gson:2.8.9=classpath
4150
com.google.crypto.tink:tink:1.3.0-rc2=classpath
42-
com.google.errorprone:error_prone_annotations:2.3.4=classpath
51+
com.google.dagger:dagger:2.28.3=classpath
52+
com.google.errorprone:error_prone_annotations:2.4.0=classpath
4353
com.google.flatbuffers:flatbuffers-java:1.12.0=classpath
4454
com.google.guava:failureaccess:1.0.1=classpath
45-
com.google.guava:guava:29.0-jre=classpath
55+
com.google.guava:guava:30.1-jre=classpath
4656
com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=classpath
4757
com.google.j2objc:j2objc-annotations:1.3=classpath
4858
com.google.jimfs:jimfs:1.1=classpath
49-
com.google.protobuf:protobuf-java-util:3.10.0=classpath
50-
com.google.protobuf:protobuf-java:3.10.0=classpath
51-
com.google.test.platform:core-proto:0.0.2-dev=classpath
52-
com.googlecode.json-simple:json-simple:1.1=classpath
59+
com.google.protobuf:protobuf-java-util:3.17.2=classpath
60+
com.google.protobuf:protobuf-java:3.17.2=classpath
61+
com.google.testing.platform:core-proto:0.0.8-alpha08=classpath
5362
com.googlecode.juniversalchardet:juniversalchardet:1.0.3=classpath
5463
com.squareup:javapoet:1.10.0=classpath
5564
com.squareup:javawriter:2.5.0=classpath
5665
com.sun.activation:javax.activation:1.2.0=classpath
57-
com.sun.istack:istack-commons-runtime:3.0.7=classpath
58-
com.sun.xml.fastinfoset:FastInfoset:1.2.15=classpath
59-
commons-codec:commons-codec:1.10=classpath
66+
com.sun.istack:istack-commons-runtime:3.0.8=classpath
67+
com.sun.xml.fastinfoset:FastInfoset:1.2.16=classpath
68+
commons-codec:commons-codec:1.11=classpath
6069
commons-io:commons-io:2.4=classpath
6170
commons-logging:commons-logging:1.2=classpath
6271
de.undercouch:gradle-download-task:4.1.1=classpath
63-
it.unimi.dsi:fastutil:7.2.0=classpath
64-
javax.activation:javax.activation-api:1.2.0=classpath
72+
io.grpc:grpc-api:1.39.0=classpath
73+
io.grpc:grpc-context:1.39.0=classpath
74+
io.grpc:grpc-core:1.39.0=classpath
75+
io.grpc:grpc-netty:1.39.0=classpath
76+
io.grpc:grpc-protobuf-lite:1.39.0=classpath
77+
io.grpc:grpc-protobuf:1.39.0=classpath
78+
io.grpc:grpc-stub:1.39.0=classpath
79+
io.netty:netty-buffer:4.1.52.Final=classpath
80+
io.netty:netty-codec-http2:4.1.52.Final=classpath
81+
io.netty:netty-codec-http:4.1.52.Final=classpath
82+
io.netty:netty-codec-socks:4.1.52.Final=classpath
83+
io.netty:netty-codec:4.1.52.Final=classpath
84+
io.netty:netty-common:4.1.52.Final=classpath
85+
io.netty:netty-handler-proxy:4.1.52.Final=classpath
86+
io.netty:netty-handler:4.1.52.Final=classpath
87+
io.netty:netty-resolver:4.1.52.Final=classpath
88+
io.netty:netty-transport:4.1.52.Final=classpath
89+
io.perfmark:perfmark-api:0.23.0=classpath
90+
jakarta.activation:jakarta.activation-api:1.2.1=classpath
91+
jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=classpath
92+
javax.annotation:javax.annotation-api:1.3.2=classpath
6593
javax.inject:javax.inject:1=classpath
66-
javax.xml.bind:jaxb-api:2.3.1=classpath
94+
net.java.dev.jna:jna-platform:5.6.0=classpath
95+
net.java.dev.jna:jna:5.6.0=classpath
6796
net.sf.jopt-simple:jopt-simple:4.9=classpath
6897
net.sf.kxml:kxml2:2.3.0=classpath
69-
net.sf.proguard:proguard-base:6.0.3=classpath
70-
net.sf.proguard:proguard-gradle:6.0.3=classpath
71-
org.antlr:antlr4:4.5.3=classpath
72-
org.apache.commons:commons-compress:1.12=classpath
73-
org.apache.httpcomponents:httpclient:4.5.6=classpath
74-
org.apache.httpcomponents:httpcore:4.4.10=classpath
98+
org.apache.commons:commons-compress:1.20=classpath
99+
org.apache.httpcomponents:httpclient:4.5.13=classpath
100+
org.apache.httpcomponents:httpcore:4.4.13=classpath
75101
org.apache.httpcomponents:httpmime:4.5.6=classpath
76-
org.bouncycastle:bcpkix-jdk15on:1.56=classpath
77-
org.bouncycastle:bcprov-jdk15on:1.56=classpath
78-
org.checkerframework:checker-qual:2.11.1=classpath
79-
org.glassfish.jaxb:jaxb-runtime:2.3.1=classpath
80-
org.glassfish.jaxb:txw2:2.3.1=classpath
102+
org.bitbucket.b_c:jose4j:0.7.0=classpath
103+
org.bouncycastle:bcpkix-jdk15on:1.67=classpath
104+
org.bouncycastle:bcprov-jdk15on:1.67=classpath
105+
org.checkerframework:checker-qual:3.5.0=classpath
106+
org.codehaus.mojo:animal-sniffer-annotations:1.19=classpath
107+
org.glassfish.jaxb:jaxb-runtime:2.3.2=classpath
108+
org.glassfish.jaxb:txw2:2.3.2=classpath
81109
org.jdom:jdom2:2.0.6=classpath
82-
org.jetbrains.intellij.deps:trove4j:1.0.20181211=classpath
83-
org.jetbrains.kotlin:kotlin-android-extensions:1.5.31=classpath
84-
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.5.31=classpath
85-
org.jetbrains.kotlin:kotlin-build-common:1.5.31=classpath
86-
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.5.31=classpath
87-
org.jetbrains.kotlin:kotlin-compiler-runner:1.5.31=classpath
88-
org.jetbrains.kotlin:kotlin-daemon-client:1.5.31=classpath
89-
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.5.31=classpath
90-
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.5.31=classpath
91-
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.5.31=classpath
92-
org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31=classpath
93-
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.5.31=classpath
94-
org.jetbrains.kotlin:kotlin-native-utils:1.5.31=classpath
95-
org.jetbrains.kotlin:kotlin-project-model:1.5.31=classpath
96-
org.jetbrains.kotlin:kotlin-reflect:1.3.72=classpath
97-
org.jetbrains.kotlin:kotlin-scripting-common:1.5.31=classpath
98-
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.5.31=classpath
99-
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.5.31=classpath
100-
org.jetbrains.kotlin:kotlin-scripting-jvm:1.5.31=classpath
101-
org.jetbrains.kotlin:kotlin-stdlib-common:1.3.72=classpath
102-
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72=classpath
103-
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72=classpath
104-
org.jetbrains.kotlin:kotlin-stdlib:1.3.72=classpath
105-
org.jetbrains.kotlin:kotlin-tooling-metadata:1.5.31=classpath
106-
org.jetbrains.kotlin:kotlin-util-io:1.5.31=classpath
107-
org.jetbrains.kotlin:kotlin-util-klib:1.5.31=classpath
110+
org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
111+
org.jetbrains.kotlin:kotlin-android-extensions:1.6.21=classpath
112+
org.jetbrains.kotlin:kotlin-annotation-processing-gradle:1.6.21=classpath
113+
org.jetbrains.kotlin:kotlin-build-common:1.6.21=classpath
114+
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.6.21=classpath
115+
org.jetbrains.kotlin:kotlin-compiler-runner:1.6.21=classpath
116+
org.jetbrains.kotlin:kotlin-daemon-client:1.6.21=classpath
117+
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.6.21=classpath
118+
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.6.21=classpath
119+
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.6.21=classpath
120+
org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21=classpath
121+
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.6.21=classpath
122+
org.jetbrains.kotlin:kotlin-native-utils:1.6.21=classpath
123+
org.jetbrains.kotlin:kotlin-project-model:1.6.21=classpath
124+
org.jetbrains.kotlin:kotlin-reflect:1.7.10=classpath
125+
org.jetbrains.kotlin:kotlin-scripting-common:1.6.21=classpath
126+
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.6.21=classpath
127+
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.6.21=classpath
128+
org.jetbrains.kotlin:kotlin-scripting-jvm:1.6.21=classpath
129+
org.jetbrains.kotlin:kotlin-stdlib-common:1.7.10=classpath
130+
org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.10=classpath
131+
org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.7.10=classpath
132+
org.jetbrains.kotlin:kotlin-stdlib:1.7.10=classpath
133+
org.jetbrains.kotlin:kotlin-tooling-metadata:1.6.21=classpath
134+
org.jetbrains.kotlin:kotlin-util-io:1.6.21=classpath
135+
org.jetbrains.kotlin:kotlin-util-klib:1.6.21=classpath
108136
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
109-
org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0=classpath
110-
org.jetbrains.trove4j:trove4j:20160824=classpath
111137
org.jetbrains:annotations:13.0=classpath
112138
org.json:json:20180813=classpath
113-
org.jvnet.staxex:stax-ex:1.8=classpath
114-
org.ow2.asm:asm-analysis:7.0=classpath
115-
org.ow2.asm:asm-commons:7.0=classpath
116-
org.ow2.asm:asm-tree:7.0=classpath
117-
org.ow2.asm:asm-util:7.0=classpath
118-
org.ow2.asm:asm:7.0=classpath
119-
org.tensorflow:tensorflow-lite-metadata:0.1.0-rc1=classpath
139+
org.jvnet.staxex:stax-ex:1.8.1=classpath
140+
org.ow2.asm:asm-analysis:9.2=classpath
141+
org.ow2.asm:asm-commons:9.2=classpath
142+
org.ow2.asm:asm-tree:9.2=classpath
143+
org.ow2.asm:asm-util:9.2=classpath
144+
org.ow2.asm:asm:9.2=classpath
145+
org.slf4j:slf4j-api:1.7.30=classpath
146+
org.tensorflow:tensorflow-lite-metadata:0.1.0-rc2=classpath
147+
xerces:xercesImpl:2.12.0=classpath
148+
xml-apis:xml-apis:1.4.01=classpath
120149
empty=
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
34
zipStoreBase=GRADLE_USER_HOME
45
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

0 commit comments

Comments
 (0)