Commit b135e2a
authored
There were some additional v1 Android embedding references missed by #6494.
This PR aims to remove those missed references.
I built the android example app of each plugin affected here on the [deletion branch](flutter/engine#52022) to be completely sure:
Final testing, I tested that the `all_packages` app builds on the v1 embedding deletion branch:
```
$ ./.ci/scripts/create_all_packages_app.sh && cd all_packages
...
$ flutter build apk --debug --local-engine-src-path=/Users/mackall/development/engine/src --local-engine=android_debug_arm64 --local-engine-host=host_debug
Running Gradle task 'assembleDebug'... 4.8s
� Built build/app/outputs/flutter-apk/app-debug.apk
```
�
Linux repo checks are failing
```
The following packages had errors:
packages/google_maps_flutter/google_maps_flutter:
Missing CHANGELOG change
packages/palette_generator:
Missing CHANGELOG change
packages/quick_actions/quick_actions:
Missing CHANGELOG change
packages/webview_flutter/webview_flutter:
Missing CHANGELOG change
```
The only changes to these packages are `xml` changes to example apps which won't cause build failures even when the v1 embedding is deleted (they will just be unused). So I believe these changes should be version exempt.
1 parent 5ba990b commit b135e2a
File tree
24 files changed
+58
-191
lines changed- packages
- espresso
- android/src/main/java/androidx/test/espresso/flutter
- action
- api
- internal/protocol/impl
- matcher
- example/android/app/src/main/java/io/flutter/app
- google_maps_flutter
- google_maps_flutter_android/example/android/app/src/main
- google_maps_flutter/example/android/app/src/main
- google_sign_in/google_sign_in_android
- android/src
- main/java/io/flutter/plugins/googlesignin
- test/java/io/flutter/plugins/googlesignin
- image_picker/image_picker_android/android/src/test/java/io/flutter/plugins/imagepicker
- in_app_purchase/in_app_purchase_android/android/src/test/java/io/flutter/plugins/inapppurchase
- palette_generator/example/android/app/src/main
- quick_actions
- quick_actions_android/example/android/app/src/main
- quick_actions/example/android/app/src/main
- video_player/video_player_android
- android/src/main/java/io/flutter/plugins/videoplayer
- webview_flutter
- webview_flutter_android/example/android/app/src/main
- webview_flutter/example/android/app/src/main
24 files changed
+58
-191
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
Lines changed: 14 additions & 16 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
38 | 38 | | |
39 | 39 | | |
40 | 40 | | |
| 41 | + | |
41 | 42 | | |
42 | 43 | | |
43 | 44 | | |
| |||
97 | 98 | | |
98 | 99 | | |
99 | 100 | | |
100 | | - | |
| 101 | + | |
| 102 | + | |
| 103 | + | |
| 104 | + | |
| 105 | + | |
| 106 | + | |
| 107 | + | |
101 | 108 | | |
102 | 109 | | |
103 | 110 | | |
104 | 111 | | |
105 | 112 | | |
106 | 113 | | |
107 | | - | |
108 | 114 | | |
109 | 115 | | |
110 | 116 | | |
| |||
171 | 177 | | |
172 | 178 | | |
173 | 179 | | |
174 | | - | |
| 180 | + | |
| 181 | + | |
175 | 182 | | |
176 | 183 | | |
177 | 184 | | |
| |||
188 | 195 | | |
189 | 196 | | |
190 | 197 | | |
191 | | - | |
| 198 | + | |
192 | 199 | | |
193 | 200 | | |
194 | 201 | | |
195 | | - | |
196 | | - | |
| 202 | + | |
| 203 | + | |
197 | 204 | | |
198 | 205 | | |
199 | 206 | | |
200 | 207 | | |
201 | 208 | | |
202 | 209 | | |
203 | 210 | | |
204 | | - | |
205 | 211 | | |
206 | 212 | | |
207 | | - | |
208 | | - | |
209 | | - | |
210 | | - | |
211 | | - | |
212 | | - | |
213 | | - | |
214 | | - | |
215 | | - | |
| 213 | + | |
216 | 214 | | |
217 | 215 | | |
218 | 216 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
23 | | - | |
| 23 | + | |
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| |||
Lines changed: 9 additions & 22 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4 | 4 | | |
5 | 5 | | |
6 | 6 | | |
7 | | - | |
8 | 7 | | |
9 | 8 | | |
10 | 9 | | |
11 | | - | |
| 10 | + | |
12 | 11 | | |
13 | 12 | | |
14 | 13 | | |
15 | 14 | | |
16 | 15 | | |
17 | 16 | | |
| 17 | + | |
18 | 18 | | |
19 | 19 | | |
20 | 20 | | |
| |||
59 | 59 | | |
60 | 60 | | |
61 | 61 | | |
62 | | - | |
63 | | - | |
| 62 | + | |
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
| |||
71 | 70 | | |
72 | 71 | | |
73 | 72 | | |
74 | | - | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
79 | | - | |
80 | | - | |
81 | | - | |
82 | | - | |
83 | | - | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
91 | 76 | | |
92 | | - | |
| 77 | + | |
| 78 | + | |
93 | 79 | | |
| 80 | + | |
94 | 81 | | |
95 | 82 | | |
Lines changed: 1 addition & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
96 | 96 | | |
97 | 97 | | |
98 | 98 | | |
99 | | - | |
100 | 99 | | |
101 | 100 | | |
102 | | - | |
103 | | - | |
| 101 | + | |
104 | 102 | | |
105 | 103 | | |
106 | 104 | | |
packages/espresso/example/android/app/src/main/java/io/flutter/app/FlutterMultiDexApplication.java
Lines changed: 0 additions & 27 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
6 | | - | |
| 6 | + | |
7 | 7 | | |
8 | 8 | | |
9 | 9 | | |
| |||
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | 19 | | |
23 | 20 | | |
24 | 21 | | |
| |||
Lines changed: 0 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
17 | 17 | | |
18 | 18 | | |
19 | 19 | | |
20 | | - | |
21 | | - | |
22 | | - | |
23 | 20 | | |
24 | 21 | | |
25 | 22 | | |
| |||
Lines changed: 4 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
1 | 5 | | |
2 | 6 | | |
3 | 7 | | |
| |||
0 commit comments