Skip to content

Commit fd223a1

Browse files
committed
Merge remote-tracking branch 'upstream/main' into gradle_7.6.3
2 parents 134d2bf + 80aa46a commit fd223a1

File tree

91 files changed

+2840
-570
lines changed

Some content is hidden

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

91 files changed

+2840
-570
lines changed

.ci/flutter_master.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f35d049e0d8e0f1b3754293f36761fa3d985fca1
1+
97190973d6f502e264a330d252ca0c709071f11d

.ci/flutter_stable.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
db7ef5bf9f59442b0e200a90587e8fa5e0c6336a
1+
b0366e0a3f089e15fd89c97604ab402fe26b724c

.github/labeler.yml

Lines changed: 149 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,149 +1,243 @@
11
'p: animations':
2-
- packages/animations/**/*
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- packages/animations/**/*
35

46
'p: camera':
5-
- packages/camera/**/*
7+
- changed-files:
8+
- any-glob-to-any-file:
9+
- packages/camera/**/*
610

711
'p: cross_file':
8-
- packages/cross_file/**/*
12+
- changed-files:
13+
- any-glob-to-any-file:
14+
- packages/cross_file/**/*
915

1016
'p: css_colors':
11-
- packages/css_colors/**/*
17+
- changed-files:
18+
- any-glob-to-any-file:
19+
- packages/css_colors/**/*
1220

1321
'p: cupertino_icons':
14-
- third_party/packages/cupertino_icons/**/*
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- third_party/packages/cupertino_icons/**/*
1525

1626
'p: dynamic_layouts':
17-
- packages/dynamic_layouts/**/*
27+
- changed-files:
28+
- any-glob-to-any-file:
29+
- packages/dynamic_layouts/**/*
1830

1931
'p: espresso':
20-
- packages/espresso/**/*
32+
- changed-files:
33+
- any-glob-to-any-file:
34+
- packages/espresso/**/*
2135

2236
'p: extension_google_sign_in_as_googleapis_auth':
23-
- packages/extension_google_sign_in_as_googleapis_auth/**/*
37+
- changed-files:
38+
- any-glob-to-any-file:
39+
- packages/extension_google_sign_in_as_googleapis_auth/**/*
2440

2541
'p: file_selector':
26-
- packages/file_selector/**/*
42+
- changed-files:
43+
- any-glob-to-any-file:
44+
- packages/file_selector/**/*
2745

2846
'p: flutter_adaptive_scaffold':
29-
- packages/flutter_adaptive_scaffold/**/*
47+
- changed-files:
48+
- any-glob-to-any-file:
49+
- packages/flutter_adaptive_scaffold/**/*
3050

3151
'p: flutter_image':
32-
- packages/flutter_image/**/*
52+
- changed-files:
53+
- any-glob-to-any-file:
54+
- packages/flutter_image/**/*
3355

3456
'p: flutter_lints':
35-
- packages/flutter_lints/**/*
57+
- changed-files:
58+
- any-glob-to-any-file:
59+
- packages/flutter_lints/**/*
3660

3761
'p: flutter_markdown':
38-
- packages/flutter_markdown/**/*
62+
- changed-files:
63+
- any-glob-to-any-file:
64+
- packages/flutter_markdown/**/*
3965

4066
'p: flutter_migrate':
41-
- packages/flutter_migrate/**/*
67+
- changed-files:
68+
- any-glob-to-any-file:
69+
- packages/flutter_migrate/**/*
4270

4371
'p: flutter_plugin_android_lifecycle':
44-
- packages/flutter_plugin_android_lifecycle/**/*
72+
- changed-files:
73+
- any-glob-to-any-file:
74+
- packages/flutter_plugin_android_lifecycle/**/*
4575

4676
'p: flutter_template_images':
47-
- packages/flutter_template_images/**/*
77+
- changed-files:
78+
- any-glob-to-any-file:
79+
- packages/flutter_template_images/**/*
4880

4981
'p: go_router':
50-
- packages/go_router/**/*
82+
- changed-files:
83+
- any-glob-to-any-file:
84+
- packages/go_router/**/*
5185

5286
'p: go_router_builder':
53-
- packages/go_router_builder/**/*
87+
- changed-files:
88+
- any-glob-to-any-file:
89+
- packages/go_router_builder/**/*
5490

5591
'p: google_identity_services':
56-
- packages/google_indentity_services_web/**
92+
- changed-files:
93+
- any-glob-to-any-file:
94+
- packages/google_indentity_services_web/**
5795

5896
'p: google_maps_flutter':
59-
- packages/google_maps_flutter/**/*
97+
- changed-files:
98+
- any-glob-to-any-file:
99+
- packages/google_maps_flutter/**/*
60100

61101
'p: google_sign_in':
62-
- packages/google_sign_in/**/*
102+
- changed-files:
103+
- any-glob-to-any-file:
104+
- packages/google_sign_in/**/*
63105

64106
'p: image_picker':
65-
- packages/image_picker/**/*
107+
- changed-files:
108+
- any-glob-to-any-file:
109+
- packages/image_picker/**/*
66110

67111
'p: in_app_purchase':
68-
- packages/in_app_purchase/**/*
112+
- changed-files:
113+
- any-glob-to-any-file:
114+
- packages/in_app_purchase/**/*
69115

70116
'p: ios_platform_images':
71-
- packages/ios_platform_images/**/*
117+
- changed-files:
118+
- any-glob-to-any-file:
119+
- packages/ios_platform_images/**/*
72120

73121
'p: local_auth':
74-
- packages/local_auth/**/*
122+
- changed-files:
123+
- any-glob-to-any-file:
124+
- packages/local_auth/**/*
75125

76126
'p: metrics_center':
77-
- packages/metrics_center/**/*
127+
- changed-files:
128+
- any-glob-to-any-file:
129+
- packages/metrics_center/**/*
78130

79131
'p: multicast_dns':
80-
- packages/multicast_dns/**/*
132+
- changed-files:
133+
- any-glob-to-any-file:
134+
- packages/multicast_dns/**/*
81135

82136
'p: palette_generator':
83-
- packages/palette_generator/**/*
137+
- changed-files:
138+
- any-glob-to-any-file:
139+
- packages/palette_generator/**/*
84140

85141
'p: path_provider':
86-
- packages/path_provider/**/*
142+
- changed-files:
143+
- any-glob-to-any-file:
144+
- packages/path_provider/**/*
87145

88146
'p: pigeon':
89-
- packages/pigeon/**/*
147+
- changed-files:
148+
- any-glob-to-any-file:
149+
- packages/pigeon/**/*
90150

91151
'p: plugin_platform_interface':
92-
- packages/plugin_platform_interface/**/*
152+
- changed-files:
153+
- any-glob-to-any-file:
154+
- packages/plugin_platform_interface/**/*
93155

94156
'p: pointer_interceptor':
95-
- packages/pointer_interceptor/**/*
157+
- changed-files:
158+
- any-glob-to-any-file:
159+
- packages/pointer_interceptor/**/*
96160

97161
'p: quick_actions':
98-
- packages/quick_actions/**/*
162+
- changed-files:
163+
- any-glob-to-any-file:
164+
- packages/quick_actions/**/*
99165

100166
'p: rfw':
101-
- packages/rfw/**/*
167+
- changed-files:
168+
- any-glob-to-any-file:
169+
- packages/rfw/**/*
102170

103171
'p: shared_preferences':
104-
- packages/shared_preferences/**/*
172+
- changed-files:
173+
- any-glob-to-any-file:
174+
- packages/shared_preferences/**/*
105175

106176
'p: standard_message_codec':
107-
- packages/standard_message_codec/**/*
177+
- changed-files:
178+
- any-glob-to-any-file:
179+
- packages/standard_message_codec/**/*
108180

109181
'p: url_launcher':
110-
- packages/url_launcher/**/*
182+
- changed-files:
183+
- any-glob-to-any-file:
184+
- packages/url_launcher/**/*
111185

112186
'p: video_player':
113-
- packages/video_player/**/*
187+
- changed-files:
188+
- any-glob-to-any-file:
189+
- packages/video_player/**/*
114190

115191
'p: web_benchmarks':
116-
- packages/web_benchmarks/**/*
192+
- changed-files:
193+
- any-glob-to-any-file:
194+
- packages/web_benchmarks/**/*
117195

118196
'p: webview_flutter':
119-
- packages/webview_flutter/**/*
197+
- changed-files:
198+
- any-glob-to-any-file:
199+
- packages/webview_flutter/**/*
120200

121201
'p: xdg_directories':
122-
- packages/xdg_directories/**/*
202+
- changed-files:
203+
- any-glob-to-any-file:
204+
- packages/xdg_directories/**/*
123205

124206
'platform-android':
125-
- packages/*/*_android/**/*
126-
- packages/**/android/**/*
207+
- changed-files:
208+
- any-glob-to-any-file:
209+
- packages/*/*_android/**/*
210+
- packages/**/android/**/*
127211

128212
'platform-ios':
129-
- packages/*/*_ios/**/*
130-
- packages/*/*_storekit/**/*
131-
- packages/*/*_wkwebview/**/*
132-
- packages/**/ios/**/*
213+
- changed-files:
214+
- any-glob-to-any-file:
215+
- packages/*/*_ios/**/*
216+
- packages/*/*_storekit/**/*
217+
- packages/*/*_wkwebview/**/*
218+
- packages/**/ios/**/*
133219

134220
'platform-linux':
135-
- packages/*/*_linux/**/*
136-
- packages/**/linux/**/*
221+
- changed-files:
222+
- any-glob-to-any-file:
223+
- packages/*/*_linux/**/*
224+
- packages/**/linux/**/*
137225

138226
'platform-macos':
139-
- packages/*/*_macos/**/*
140-
- packages/**/macos/**/*
227+
- changed-files:
228+
- any-glob-to-any-file:
229+
- packages/*/*_macos/**/*
230+
- packages/**/macos/**/*
141231

142232
'platform-web':
143-
- packages/*/*_web/**/*
144-
- packages/**/web/**/*
233+
- changed-files:
234+
- any-glob-to-any-file:
235+
- packages/*/*_web/**/*
236+
- packages/**/web/**/*
145237

146238
'platform-windows':
147-
- packages/*/*_windows/**/*
148-
- packages/**/windows/**/*
239+
- changed-files:
240+
- any-glob-to-any-file:
241+
- packages/*/*_windows/**/*
242+
- packages/**/windows/**/*
149243

.github/workflows/pull_request_label.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
pull-requests: write
2222
runs-on: ubuntu-latest
2323
steps:
24-
- uses: actions/labeler@ac9175f8a1f3625fd0d4fb234536d26811351594
24+
- uses: actions/labeler@8558fd74291d67161a8a78ce36a881fa63b766a9
2525
with:
2626
repo-token: "${{ secrets.GITHUB_TOKEN }}"
2727
sync-labels: true

packages/animations/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
## 2.0.11
1+
## NEXT
22

33
* Updates example app Gradle version to 7.6.3.
44

55
## 2.0.10
66

7+
78
* Updates minimum supported SDK version to Flutter 3.16/Dart 3.2.
89

910
## 2.0.9

packages/animations/pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: animations
22
description: Fancy pre-built animations that can easily be integrated into any Flutter application.
33
repository: https://github.com/flutter/packages/tree/main/packages/animations
44
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+animations%22
5-
version: 2.0.11
5+
version: 2.0.10
66

77
environment:
88
sdk: ">=3.2.0 <4.0.0"

packages/go_router/CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
1-
## 12.1.3
1+
## NEXT
22

33
* Updates example app Gradle version to 7.6.3.
44

5+
## 12.1.3
6+
7+
* Fixes a typo in `navigation.md`.
8+
59
## 12.1.2
610

711
* Fixes an incorrect use of `extends` for Dart 3 compatibility.

packages/go_router/doc/navigation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ onTap: () => context.pop(true)
8888
You can provide additional data along with navigation.
8989

9090
```dart
91-
context.go('/123, extra: 'abc');
91+
context.go('/123', extra: 'abc');
9292
```
9393

9494
and retrieve the data from GoRouterState

packages/go_router_builder/CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
## NEXT
1+
## 2.4.0
22

3+
* Adds support for passing observers to the ShellRoute for the nested Navigator.
34
* Updates minimum supported SDK version to Flutter 3.10/Dart 3.0.
45

56
## 2.3.4

0 commit comments

Comments
 (0)