Skip to content

Commit f88712e

Browse files
authored
Merge branch 'master' into ios-accessibility-bridge-reattach
2 parents befea27 + e92c084 commit f88712e

1,985 files changed

Lines changed: 73539 additions & 45310 deletions

File tree

Some content is hidden

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

‎.agents/skills/bump-dart/SKILL.md‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
---
2+
name: bump-dart
3+
description: Do not trigger automatically; only run when a user runs /bump-dart. Bump the minimum Dart SDK version constraint across the flutter/flutter repository, update dependency checksums, and run verification.
4+
---
5+
6+
# Bumping the Dart SDK Version Constraint
7+
8+
## Important Rules
9+
10+
1. **Never Update Dependencies to 'any':** The skill must **never** change or update any dependency version constraint to `any` in order to resolve version conflicts.
11+
2. **Pause and Ask on Issues:** If you run into any issues executing the task (e.g., version resolution failures, checksum mismatches, test failures, or analyzer errors), **do not** attempt to fix them by modifying other dependencies. Pause immediately, report the exact error details, and ask the user for instructions.
12+
3. **Handle Language Feature Version Discrepancies:** If static analysis fails because a package uses language features from a newer SDK version than the requested target (e.g., `private-named-parameters` in `widget_preview_scaffold` requiring `3.12.0`), ask the user if that specific package should be targeted at the higher SDK version while the rest of the repository remains at the requested target.
13+
14+
## Step-by-Step Workflow
15+
16+
Follow these steps carefully to perform the bump, resolve dependencies, and verify the changes.
17+
18+
### Step 1: Pre-flight Checks
19+
1. **Verify target version suffix:**
20+
Ensure the version constraint specified by the user includes the `-0` pre-release suffix (e.g., `^3.13.0-0` instead of `^3.13.0`).
21+
* **Why:** Standard caret constraints like `^3.13.0` exclude pre-release versions of that major/minor release. Since active development and CI run on pre-releases, omitting the `-0` suffix will cause package resolution to fail. If the user provided a version without `-0`, append it or ask the user for confirmation.
22+
2. **Ensure SDK is already rolled:**
23+
The target Dart SDK version must already have rolled into the repository (e.g. the local Dart SDK from the Engine stamp is at least that version). Otherwise, package resolution and analysis will fail.
24+
25+
### Step 2: Update `pubspec.yaml` Files
26+
Run the repository's Dart tool script to update matching `pubspec.yaml` files cross-platform:
27+
28+
```bash
29+
dart dev/tools/bin/bump_version_constraints.dart <OLD_VERSION_CONSTRAINT> <NEW_VERSION_CONSTRAINT>
30+
```
31+
*Example:* `dart dev/tools/bin/bump_version_constraints.dart ^3.10.0-0 ^3.11.0-0`
32+
33+
* The script only updates packages whose current SDK constraint matches `<OLD_VERSION_CONSTRAINT>`. If it encounters packages with deviating constraints (e.g. higher SDK versions like `^3.12.0` or custom ranges), it leaves them untouched and prints a message flagging them to the user.
34+
35+
### Step 3: Update Dependency Checksums and Hashes
36+
Flutter enforces dependency integrity via checksums. Run the `update-packages` tool to re-solve the package workspace, generate updated `pubspec.lock` files, and update the checksums:
37+
38+
```bash
39+
flutter update-packages --force-upgrade --update-hashes
40+
```
41+
42+
### Step 4: Run Static Analysis
43+
Verify the new constraints solve correctly and do not introduce any analyzer errors, warnings, lints (infos), or deprecations.
44+
45+
Run static analysis:
46+
```bash
47+
flutter analyze --flutter-repo
48+
```
49+
* Treat any non-zero exit code from `flutter analyze` as a failure. Do not ignore `info` (lint) or `warning` diagnostics, as the Flutter repository requires all analysis issues to be clean. Pay close attention to newly firing lints or deprecated lint rule warnings.
50+
51+
### Step 5: Report Status, Write Results File, and Prepare Pull Request
52+
1. **Write Results File in Workspace Root:**
53+
Always write a detailed report of the bump execution to a file named `bump_results.md` in the workspace root (e.g., `<flutter_root>/bump_results.md`). The file must include:
54+
- Target SDK version and current Engine SDK version.
55+
- The exact bump command run.
56+
- Count/details of updated `pubspec.yaml` files.
57+
- List of skipped/flagged packages with their constraints.
58+
- Results of the `update-packages` and static analysis runs (highlighting any failures, warnings, or newly firing lints).
59+
2. **Handle Failure/Success:**
60+
- If static analysis fails (even if it only contains `info` or `warning` diagnostics like `prefer_initializing_formals` or `deprecated_lint`), list the failures/warnings in `bump_results.md`, report them to the user, and ask for guidance (or proceed to fix them if instructed).
61+
- If static analysis passes, point the user to `bump_results.md` in the workspace root, show a summary of modified files (`git status`), and prompt the user to commit the changes and prepare a pull request.
File renamed without changes.

‎.ci.yaml‎

Lines changed: 47 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -700,7 +700,6 @@ targets:
700700

701701
- name: Linux snippets
702702
recipe: flutter/flutter_drone
703-
bringup: true
704703
timeout: 30
705704
properties:
706705
tags: >
@@ -1836,6 +1835,18 @@ targets:
18361835
{"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
18371836
]
18381837
1838+
- name: Linux_android_emu_vulkan_stable android_engine_hcpp_tests
1839+
recipe: flutter/flutter_drone
1840+
timeout: 60
1841+
properties:
1842+
shard: android_engine_hcpp_tests
1843+
tags: >
1844+
["framework", "hostonly", "shard", "linux"]
1845+
dependencies: >-
1846+
[
1847+
{"dependency": "goldctl", "version": "git_revision:c845c41b9b81bfcb11f2f0ab17b5b2386d634c31"}
1848+
]
1849+
18391850
- name: Linux_android_emu android_engine_opengles_tests
18401851
recipe: flutter/flutter_drone
18411852
timeout: 60
@@ -1877,8 +1888,9 @@ targets:
18771888
]
18781889
18791890
- name: Linux_android_emu_vulkan_stable android_hardware_smoke_vulkan_instrumented_tests
1880-
bringup: true
18811891
recipe: flutter/flutter_drone
1892+
# Post-submit only: Instrumented tests are more resource-intensive; driver shards catch most regressions in presubmit.
1893+
presubmit: false
18821894
timeout: 60
18831895
properties:
18841896
shard: android_hardware_smoke_vulkan_instrumented_tests
@@ -1890,8 +1902,9 @@ targets:
18901902
]
18911903
18921904
- name: Linux_android_emu android_hardware_smoke_opengles_instrumented_tests
1893-
bringup: true
18941905
recipe: flutter/flutter_drone
1906+
# Post-submit only: Instrumented tests are more resource-intensive; driver shards catch most regressions in presubmit.
1907+
presubmit: false
18951908
timeout: 60
18961909
properties:
18971910
shard: android_hardware_smoke_opengles_instrumented_tests
@@ -2702,7 +2715,6 @@ targets:
27022715
recipe: devicelab/devicelab_drone
27032716
presubmit: false
27042717
timeout: 60
2705-
bringup: true
27062718
properties:
27072719
tags: >
27082720
["devicelab", "android", "linux", "mokey"]
@@ -2771,7 +2783,6 @@ targets:
27712783

27722784
- name: Linux_android_emu external_textures_integration_test
27732785
recipe: devicelab/devicelab_drone
2774-
bringup: true
27752786
timeout: 60
27762787
# Functionally the same as "presubmit: false", except that we will run on
27772788
# presubmit during engine rolls. This test is the *only* automated e2e
@@ -3668,6 +3679,19 @@ targets:
36683679
["devicelab", "android", "linux", "pixel", "7pro"]
36693680
task_name: animated_advanced_blend_perf__timeline_summary
36703681

3682+
- name: Mac ios_universal_link_test
3683+
recipe: devicelab/devicelab_drone
3684+
presubmit: false
3685+
timeout: 60
3686+
properties:
3687+
tags: >
3688+
["devicelab", "hostonly", "mac"]
3689+
dependencies: >-
3690+
[
3691+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
3692+
]
3693+
task_name: ios_universal_link_test
3694+
36713695
- name: Mac_ios animated_advanced_blend_perf_ios__timeline_summary
36723696
recipe: devicelab/devicelab_drone
36733697
presubmit: false
@@ -4500,7 +4524,7 @@ targets:
45004524
- engine/**
45014525
- DEPS
45024526

4503-
- name: Mac module_uiscene_test_ios
4527+
- name: Mac uiscene_plugin_lifecycle_test_ios
45044528
recipe: devicelab/devicelab_drone
45054529
timeout: 60
45064530
properties:
@@ -4510,7 +4534,7 @@ targets:
45104534
]
45114535
tags: >
45124536
["devicelab", "hostonly", "mac"]
4513-
task_name: module_uiscene_test_ios
4537+
task_name: uiscene_plugin_lifecycle_test_ios
45144538
runIf:
45154539
- dev/**
45164540
- packages/flutter_tools/**
@@ -5349,7 +5373,6 @@ targets:
53495373

53505374
- name: Mac channels_integration_test_ios
53515375
recipe: devicelab/devicelab_drone
5352-
bringup: true
53535376
presubmit: false
53545377
timeout: 60
53555378
properties:
@@ -5411,19 +5434,22 @@ targets:
54115434
#
54125435
# Also, rename this to "external_textures_integration_test" to be consistent
54135436
# with the Android test, but that can wait until we've figured out the flake.
5414-
- name: Mac_ios external_ui_integration_test_ios
5437+
- name: Mac external_ui_integration_test_ios
54155438
recipe: devicelab/devicelab_drone
54165439
presubmit: false
54175440
timeout: 60
54185441
properties:
5442+
dependencies: >-
5443+
[
5444+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5445+
]
54195446
tags: >
5420-
["devicelab", "ios", "mac"]
5447+
["devicelab", "hostonly", "mac"]
54215448
task_name: external_textures_integration_test_ios
54225449
ignore_flakiness: "true"
54235450

54245451
- name: Mac route_test_ios
54255452
recipe: devicelab/devicelab_drone
5426-
bringup: true
54275453
presubmit: false
54285454
timeout: 60
54295455
properties:
@@ -5653,13 +5679,17 @@ targets:
56535679
["devicelab", "hostonly", "mac"]
56545680
task_name: ios_defines_test
56555681

5656-
- name: Mac_ios hello_world_impeller_ios_sdfs
5682+
- name: Mac hello_world_impeller_ios_sdfs
56575683
recipe: devicelab/devicelab_drone
56585684
presubmit: false
56595685
timeout: 60
56605686
properties:
5687+
dependencies: >-
5688+
[
5689+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5690+
]
56615691
tags: >
5662-
["devicelab", "ios", "mac"]
5692+
["devicelab", "hostonly", "mac"]
56635693
task_name: hello_world_impeller_ios_sdfs
56645694

56655695
- name: Mac_ios large_image_changer_perf_ios
@@ -5795,7 +5825,6 @@ targets:
57955825

57965826
- name: Mac platform_interaction_test_ios
57975827
recipe: devicelab/devicelab_drone
5798-
bringup: true
57995828
presubmit: false
58005829
timeout: 60
58015830
properties:
@@ -6736,7 +6765,6 @@ targets:
67366765
- name: Windows flavors_test_windows
67376766
recipe: devicelab/devicelab_drone
67386767
presubmit: false
6739-
bringup: true
67406768
timeout: 60
67416769
properties:
67426770
dependencies: >-
@@ -7152,7 +7180,6 @@ targets:
71527180
- name: Windows tool_tests_commands_2_2
71537181
recipe: flutter/flutter_drone
71547182
timeout: 60
7155-
bringup: true
71567183
properties:
71577184
add_recipes_cq: "true"
71587185
dependencies: >-
@@ -7257,7 +7284,6 @@ targets:
72577284
- name: Windows windows_gradient_consistent_perf__e2e_summary
72587285
recipe: devicelab/devicelab_drone
72597286
presubmit: false
7260-
bringup: true
72617287
timeout: 60
72627288
properties:
72637289
tags: >
@@ -7271,7 +7297,6 @@ targets:
72717297
- name: Windows windows_gradient_dynamic_perf__e2e_summary
72727298
recipe: devicelab/devicelab_drone
72737299
presubmit: false
7274-
bringup: true
72757300
timeout: 60
72767301
properties:
72777302
tags: >
@@ -7285,7 +7310,6 @@ targets:
72857310
- name: Windows windows_gradient_static_perf__e2e_summary
72867311
recipe: devicelab/devicelab_drone
72877312
presubmit: false
7288-
bringup: true
72897313
timeout: 60
72907314
properties:
72917315
tags: >
@@ -7325,7 +7349,6 @@ targets:
73257349
- name: Windows new_gallery_windows_impeller__transition_perf
73267350
recipe: devicelab/devicelab_drone
73277351
presubmit: false
7328-
bringup: true
73297352
timeout: 60
73307353
properties:
73317354
tags: >
@@ -7339,7 +7362,6 @@ targets:
73397362
- name: Windows new_gallery_windows_skia__transition_perf
73407363
recipe: devicelab/devicelab_drone
73417364
presubmit: false
7342-
bringup: true
73437365
timeout: 60
73447366
properties:
73457367
tags: >
@@ -7719,9 +7741,12 @@ targets:
77197741
- name: Mac windowing_test
77207742
recipe: devicelab/devicelab_drone
77217743
presubmit: true
7722-
bringup: true
77237744
timeout: 60
77247745
properties:
7746+
dependencies: >-
7747+
[
7748+
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
7749+
]
77257750
tags: >
77267751
["devicelab", "hostonly", "mac"]
77277752
task_name: windowing_test_macos

‎.github/ISSUE_TEMPLATE/07_design_doc.yml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
name: Share a Flutter design document
2-
description: As a contributor, I would like to share a design document.
2+
description: As a contributor, I would like to share a design document or RFC.
33
labels: ['design doc']
44
body:
55
- type: markdown
66
attributes:
77
value: |
88
Thank you for your interest in contributing to Flutter!
99
10-
Please ensure that you are following
11-
https://github.com/flutter/flutter/blob/main/docs/contributing/Design-Documents.md
10+
Please ensure that you are following the [Flutter RFC Process](https://github.com/flutter/rfc/blob/main/rfc/000.0002-flutter-rfc-review-process.md)
11+
and our [Design Documents guide](https://github.com/flutter/flutter/blob/main/docs/contributing/Design-Documents.md)
1212
when sharing a design document.
1313
1414
Please fill out the sections below to the best of your ability.
1515
- type: input
1616
id: document_link
1717
attributes:
18-
label: Document Link
18+
label: RFC Pull Request Link
1919
description: |
20-
Insert the "https://flutter.dev/go" link for your document here.
21-
For details on creating a link, see the instructions in
22-
https://flutter.dev/go/template
20+
Insert the link to your RFC pull request in flutter/rfc (e.g. "https://github.com/flutter/rfc/pull/...").
21+
For details on the RFC process, see:
22+
https://github.com/flutter/rfc/blob/main/rfc/000.0002-flutter-rfc-review-process.md
23+
and https://github.com/flutter/flutter/blob/main/docs/contributing/Design-Documents.md
2324
validations:
2425
required: true
2526
- type: textarea

‎.github/ISSUE_TEMPLATE/08_first_party_packages.yml‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,16 @@ body:
3131
- animations
3232
- camera
3333
- cross_file
34+
- cupertino_icons
35+
- cupertino_ui
3436
- espresso
3537
- extension_google_sign_in_as_googleapis_auth
3638
- file_selector
39+
- flutter_hook_config
3740
- flutter_lints
3841
- flutter_migrate
3942
- flutter_plugin_android_lifecycle
43+
- flutter_shaders
4044
- flutter_svg
4145
- flutter_template_images
4246
- go_router
@@ -49,15 +53,17 @@ body:
4953
- image_picker
5054
- in_app_purchase
5155
- interactive_media_ads
56+
- listen
5257
- local_auth
58+
- material_ui
5359
- metrics_center
5460
- multicast_dns
61+
- mustache_template
5562
- path_parsing
5663
- path_provider
5764
- pigeon
5865
- plugin_platform_interface
5966
- pointer_interceptor
60-
- process
6167
- quick_actions
6268
- rfw
6369
- shared_preferences

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ To learn more about code review, see our documentation on Tree Hygiene: https://
1818
- [ ] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement].
1919
- [ ] I signed the [CLA].
2020
- [ ] I listed at least one issue that this PR fixes in the description above.
21-
- [ ] I updated/added relevant documentation (doc comments with `///`).
21+
- [ ] I updated/added relevant in-code documentation (doc comments with `///`).
22+
- [ ] If this PR introduces a new feature or capability, I created and linked a website documentation issue or PR in [flutter/website] (or verified none is needed).
2223
- [ ] I added new tests to check the change I am making, or this PR is [test-exempt].
2324
- [ ] I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
2425
- [ ] All existing and new tests are passing.
@@ -38,6 +39,7 @@ If this change needs to override an active code freeze, provide a comment explai
3839
[Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement
3940
[CLA]: https://cla.developers.google.com/
4041
[flutter/tests]: https://github.com/flutter/tests
42+
[flutter/website]: https://github.com/flutter/website
4143
[breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes
4244
[Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md
4345
[Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md

‎.github/workflows/content-aware-hash.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,4 @@ jobs:
2525
# test notice annotation for retrival from api
2626
echo "::notice ::{\"engine_content_hash\": \"${engine_content_hash}\"}"
2727
# test summary writing
28-
echo "{\"engine_content_hash\": \"${engine_content_hash}\"" >> $GITHUB_STEP_SUMMARY
28+
echo "{\"engine_content_hash\": \"${engine_content_hash}\"" >> "$GITHUB_STEP_SUMMARY"

0 commit comments

Comments
 (0)