Skip to content

Commit 71c48b8

Browse files
Merge remote-tracking branch 'upstream/master' into unify-ui-paint-across-canvaskit-and-skwasm
2 parents 991fbbf + 8c1cad1 commit 71c48b8

167 files changed

Lines changed: 6324 additions & 2492 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.

‎.ci.yaml‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -3768,7 +3768,6 @@ targets:
37683768
- name: Mac_ios impeller_primitives_perf_suite_ios__timeline_summary
37693769
recipe: devicelab/devicelab_drone
37703770
presubmit: false
3771-
bringup: true
37723771
timeout: 60
37733772
properties:
37743773
tags: >
@@ -5602,34 +5601,6 @@ targets:
56025601
["devicelab", "hostonly", "mac"]
56035602
task_name: integration_ui_ios_textfield
56045603

5605-
- name: Mac_x64 ios_app_with_extensions_test
5606-
recipe: devicelab/devicelab_drone
5607-
presubmit: false
5608-
enabled_branches:
5609-
- stable # TODO(flutter/flutter#189295): Delete this builder after 3.50 is released.
5610-
timeout: 60
5611-
properties:
5612-
dependencies: >-
5613-
[
5614-
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5615-
]
5616-
tags: >
5617-
["devicelab", "hostonly", "mac"]
5618-
task_name: ios_app_with_extensions_test
5619-
5620-
- name: Mac_arm64 ios_app_with_extensions_test
5621-
recipe: devicelab/devicelab_drone
5622-
presubmit: false
5623-
timeout: 60
5624-
properties:
5625-
dependencies: >-
5626-
[
5627-
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"}
5628-
]
5629-
tags: >
5630-
["devicelab", "hostonly", "mac", "arm64"]
5631-
task_name: ios_app_with_extensions_test
5632-
56335604
- name: Mac ios_defines_test
56345605
recipe: devicelab/devicelab_drone
56355606
presubmit: false

‎CONTRIBUTING.md‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Contributing to Flutter
44
=======================
55

6-
_tl;dr: join [Discord](./docs/contributing/Chat.md), be [courteous](CODE_OF_CONDUCT.md), follow the steps below to set up a development environment; if you stick around and contribute, you can [join the team](./docs/contributing/Contributor-access.md) and get commit access._
6+
_tl;dr: join [Discord](./docs/contributing/Chat.md), be [courteous](CODE_OF_CONDUCT.md), follow the steps below to set up a development environment; if you stick around and contribute, you can advance on the [Flutter Contributor Ladder](https://github.com/flutter/contributors) and earn [triage and commit access](./docs/contributing/Contributor-access.md)._
77

88
Welcome
99
-------
@@ -14,11 +14,7 @@ on our mailing lists, our chat channels, or on Stack Overflow, helping to triage
1414
fix bugs that people have filed, adding to our documentation,
1515
doing outreach about Flutter, or helping out in any other way.
1616

17-
We grant commit access (which includes full rights to the issue
18-
database, such as being able to edit labels) to people who have gained
19-
our trust and demonstrated a commitment to Flutter. For more details
20-
see the [Contributor access](./docs/contributing/Contributor-access.md)
21-
page in our docs.
17+
We grant triage access (such as being able to edit labels and close duplicate issues as a **Reviewer**) and commit access (full repository write and merge permissions as a **Committer**) through the [Flutter Contributor Ladder](https://github.com/flutter/contributors) to people who have gained our trust and demonstrated a commitment to Flutter. For more details see the [Contributor access](./docs/contributing/Contributor-access.md) page in our docs.
2218

2319
We communicate primarily over GitHub and [Discord](./docs/contributing/Chat.md).
2420

@@ -63,9 +59,8 @@ If you want to help us triage, you are very welcome to do so!
6359
which covers the meanings of some important GitHub labels and
6460
milestones.
6561

66-
5. Once you've been doing this for a while, someone will invite you to the flutter-hackers
67-
team on GitHub and you'll be able to add labels too. See the
68-
[contributor access](./docs/contributing/Contributor-access.md) wiki
62+
5. Once you've been doing this for a while, you can be invited to join the [Flutter Contributor Ladder](https://github.com/flutter/contributors) as a **Reviewer** (part of the `flutter-hackers` team on GitHub) and you'll be able to add labels too. See the
63+
[contributor access](./docs/contributing/Contributor-access.md)
6964
page for details.
7065

7166

@@ -185,13 +180,13 @@ everyone, regardless of whether you have commit access.
185180
Anyone can provide review feedback on a change, and doing so is an excellent way
186181
to learn the codebase.
187182

188-
While reviews are welcome from the entire community, currently only members of
189-
the `flutter-hackers` group can grant the final approval required for a change
190-
to land. Consistently providing helpful code reviews is a valid and highly
191-
encouraged path to joining this group.
183+
While reviews are welcome from the entire community, only members of
184+
the `flutter-hackers` group on the [Flutter Contributor Ladder](https://github.com/flutter/contributors) (`Reviewers`, `Committers`, and `Maintainers`) can grant the approvals required for a change
185+
to land (with at least one binding approval from a `Committer` or `Maintainer`; see the [Code Review Workflow](https://github.com/flutter/contributors/blob/main/docs/CODE_REVIEW_WORKFLOW.md)). Consistently providing helpful code reviews is a valid and highly
186+
encouraged path to joining the contributor ladder.
192187

193-
For more information on how to earn commit access, please read the
194-
[Contributor access guide](./docs/contributing/Contributor-access.md).
188+
For more information on how to earn triage and commit access, please read the
189+
[Contributor access guide](./docs/contributing/Contributor-access.md) and [`flutter/contributors`](https://github.com/flutter/contributors).
195190

196191
### How to Review
197192

‎DEPS‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ vars = {
1515
'skia_git': 'https://skia.googlesource.com',
1616
'llvm_git': 'https://llvm.googlesource.com',
1717
'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
18-
'skia_revision': 'f96be51af95d38a9aad699bf0f52c259f5306ff3',
18+
'skia_revision': 'a5aacd103e68aefc1e2688971c4bbb7165293865',
1919

2020
# Do not download the Emscripten SDK by default.
2121
# This prevents us from downloading the Emscripten toolchain for builds
@@ -55,24 +55,24 @@ vars = {
5555
# updated revision list of existing dependencies. You will need to
5656
# gclient sync before and after update deps to ensure all deps are updated.
5757
# updated revision list of existing dependencies.
58-
'dart_revision': 'e362a23e9738cc89559af41acb976ce1cc168f73',
58+
'dart_revision': '6623b84628f37ca842215f6cef01a0459e0686af',
5959

6060
# WARNING: DO NOT EDIT MANUALLY
6161
# The lines between blank lines above and below are generated by a script. See create_updated_flutter_deps.py
6262
'dart_binaryen_rev': 'a631c1445ced72a905b3303b26f148fc706647dd',
63-
'dart_boringssl_rev': '77cb16a15b27beefab1e1284064a4d99895ef230',
64-
'dart_core_rev': 'd7bd45c161f34e711778250621dbae48e754a26e',
65-
'dart_devtools_rev': '9ac04e2d8e52b1e868ae481622be3818660a54dc',
66-
'dart_ecosystem_rev': '24b9ba8d8a04ae53cccaa574046bf76774e24001',
67-
'dart_http_rev': 'c76dfb3a2a53ce5d8e3c4366f4a088422de09aa5',
68-
'dart_i18n_rev': '4c7b4ad14893d84ba6f1ec934b0068d2c2b3f088',
63+
'dart_boringssl_rev': '95f9e9f22f23f429c441c93d476ea52ee05b25e0',
64+
'dart_core_rev': '36f57a994965785d641e436b7dd3aa8a18a26f62',
65+
'dart_devtools_rev': '04999fa04267c131211a3e928009239de1b6a774',
66+
'dart_ecosystem_rev': '54e16739d9c15ef0b77e050242c16226ad9235f9',
67+
'dart_http_rev': '1f869d02260b485e1a5b923c5f02c9697402c6a6',
68+
'dart_i18n_rev': '7475ce643ed6210e5e787b310bb5bc24de9a2158',
6969
'dart_perfetto_rev': '13ce0c9e13b0940d2476cd0cff2301708a9a2e2b',
70-
'dart_protobuf_rev': '1d52301b3dd61be159c55143c048a745175fead3',
70+
'dart_protobuf_rev': '19191c8c5881d4a63db804bbed26fa1dcdd17ed0',
7171
'dart_pub_rev': '9df389a76385f82c1165c7cf93b78807b5ea8890',
7272
'dart_sync_http_rev': '6666fff944221891182e1f80bf56569338164d72',
73-
'dart_tools_rev': '3980dca39a23ce4894656de47b1fc944fdabb984',
73+
'dart_tools_rev': 'a3427446f3c5bfa65e254deb63e62085635e22a2',
7474
'dart_vector_math_rev': 'cf3b5db7340d317dd3489e5a35434b408020a852',
75-
'dart_web_rev': '4e60e61e55e1e2111f0fec9d19efff577c0dc671',
75+
'dart_web_rev': 'f388bf5a1f8ce55f7e519110945c05e638bf0104',
7676
'dart_webdriver_rev': '8e5c611ea242efdc9f597a8a37c38a9c586120ee',
7777
'dart_webkit_inspection_protocol_rev': '2c255f2a153239d009385774f12eb57e1c3056eb',
7878

@@ -289,7 +289,7 @@ deps = {
289289
Var('chromium_git') + '/external/github.com/google/flatbuffers' + '@' + '067bfdbde9b10c1beb5d6b02d67ae9db8b96f736',
290290

291291
'engine/src/flutter/third_party/icu':
292-
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + '4fe960221710e5b5524ac6e49a454bbb8bfc295d',
292+
Var('chromium_git') + '/chromium/deps/icu.git' + '@' + 'a0ea93436c528ca316a6e698e483e258839101a5',
293293

294294
'engine/src/flutter/third_party/gtest-parallel':
295295
Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '38191e2733d7cbaeaef6a3f1a942ddeb38a2ad14',
@@ -324,7 +324,7 @@ deps = {
324324
Var('chromium_git') + '/external/github.com/WebAssembly/binaryen.git' + '@' + Var('dart_binaryen_rev'),
325325

326326
'engine/src/flutter/third_party/dart/third_party/devtools':
327-
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:9ac04e2d8e52b1e868ae481622be3818660a54dc'}]},
327+
{'dep_type': 'cipd', 'packages': [{'package': 'dart/third_party/flutter/devtools', 'version': 'git_revision:04999fa04267c131211a3e928009239de1b6a774'}]},
328328

329329
'engine/src/flutter/third_party/dart/third_party/perfetto/src':
330330
Var('chromium_git') + '/external/github.com/google/perfetto' + '@' + Var('dart_perfetto_rev'),
@@ -336,7 +336,7 @@ deps = {
336336
Var('dart_git') + '/dart_style.git@76978d23bfb3d225c81ce3f119ab7055a2a57136',
337337

338338
'engine/src/flutter/third_party/dart/third_party/pkg/dartdoc':
339-
Var('dart_git') + '/dartdoc.git@db94437c1e4246571ca32ab27cb43cca2307c93e',
339+
Var('dart_git') + '/dartdoc.git@2f6847bd9773ce3b5b7db99283561e7a3ee58140',
340340

341341
'engine/src/flutter/third_party/dart/third_party/pkg/ecosystem':
342342
Var('dart_git') + '/ecosystem.git' + '@' + Var('dart_ecosystem_rev'),
@@ -351,7 +351,7 @@ deps = {
351351
Var('dart_git') + '/leak_tracker.git@f5620600a5ce1c44f65ddaa02001e200b096e14c',
352352

353353
'engine/src/flutter/third_party/dart/third_party/pkg/native':
354-
Var('dart_git') + '/native.git@e0ca7c60ffa6fe7377b26712569e9535c28f90ed',
354+
Var('dart_git') + '/native.git@18386375888e370851e2f8851a2d7ca84273d6f5',
355355

356356
'engine/src/flutter/third_party/dart/third_party/pkg/protobuf':
357357
Var('dart_git') + '/protobuf.git' + '@' + Var('dart_protobuf_rev'),
@@ -360,7 +360,7 @@ deps = {
360360
Var('dart_git') + '/pub.git' + '@' + Var('dart_pub_rev'),
361361

362362
'engine/src/flutter/third_party/dart/third_party/pkg/shelf':
363-
Var('dart_git') + '/shelf.git@62d3e4ee2503c3c497f749276e86b2331c18fd6a',
363+
Var('dart_git') + '/shelf.git@9946de555f1eb3abd8ae5054848b9c3c2bd36e4d',
364364

365365
'engine/src/flutter/third_party/dart/third_party/pkg/sync_http':
366366
Var('dart_git') + '/sync_http.git' + '@' + Var('dart_sync_http_rev'),
@@ -369,7 +369,7 @@ deps = {
369369
Var('dart_git') + '/external/github.com/simolus3/tar.git@201952a191be34a993f4ae182612c891ea4ef0a2',
370370

371371
'engine/src/flutter/third_party/dart/third_party/pkg/test':
372-
Var('dart_git') + '/test.git@6d747209b2565e648f1c8d36ecb99d206a3f1e0e',
372+
Var('dart_git') + '/test.git@2a9e01756f42123102a34faf2964130ba7e0f77a',
373373

374374
'engine/src/flutter/third_party/dart/third_party/pkg/tools':
375375
Var('dart_git') + '/tools.git' + '@' + Var('dart_tools_rev'),
@@ -839,7 +839,7 @@ deps = {
839839
'packages': [
840840
{
841841
'package': 'fuchsia/sdk/core/linux-amd64',
842-
'version': 'p0HDXLISPIElJfSz7FIV0fJZJRc3d4cPzOfXp9yFcz8C'
842+
'version': 'Fqe3UlLwAohsPbsCSSu_O5mUWj_zyku1z9AQ9iJaKFMC'
843843
}
844844
],
845845
'condition': 'download_fuchsia_deps and not download_fuchsia_sdk',

‎TESTOWNERS‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@
207207
/dev/devicelab/bin/tasks/integration_ui_ios_frame_number.dart @jtmcdole @flutter/engine
208208
/dev/devicelab/bin/tasks/integration_ui_ios_keyboard_resize.dart @LongCatIsLooong @flutter/engine
209209
/dev/devicelab/bin/tasks/integration_ui_ios_textfield.dart @LongCatIsLooong @flutter/tool
210-
/dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart @vashworth @flutter/tool
211210
/dev/devicelab/bin/tasks/ios_defines_test.dart @okorohelijah @flutter/tool
212211
/dev/devicelab/bin/tasks/ios_picture_cache_complexity_scoring_perf__timeline_summary.dart @flar @flutter/engine
213212
/dev/devicelab/bin/tasks/keyboard_hot_restart_ios.dart @loic-sharma @flutter/ios
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
670b30ed698a4cbfa3061b9fc76b698658b843b8
1+
04781623f406d4446dfc9d52686ccc02c22936db

‎dev/bots/test.dart‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,10 @@ Future<void> _runBuildTests() async {
385385
.cast<Directory>()
386386
.toList()
387387
..add(Directory(path.join(flutterRoot, 'packages', 'integration_test', 'example')))
388+
// Depends on the google_mobile_ads plugin, so its Android and iOS builds
389+
// exercise native plugin integration that would otherwise only be built
390+
// by post-submit devicelab benchmarks. See flutter/flutter#185538.
391+
..add(Directory(path.join(flutterRoot, 'dev', 'benchmarks', 'platform_views_layout')))
388392
..add(
389393
Directory(
390394
path.join(flutterRoot, 'dev', 'integration_tests', 'android_semantics_testing'),

‎dev/bots/tool_test_durations.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
"test/integration.shard/hot_reload_test.dart": 50,
149149
"test/integration.shard/hot_reload_with_asset_test.dart": 9,
150150
"test/integration.shard/hot_restart_with_unhandled_exception_test.dart": 8,
151+
"test/integration.shard/ios_app_with_extensions_test.dart": 0,
151152
"test/integration.shard/ios_content_validation_test.dart": 0,
152153
"test/integration.shard/isolated/dart_data_asset_conflicting_assets_test.dart": 32,
153154
"test/integration.shard/isolated/dart_data_asset_flutter_build_test.dart": 97,
@@ -364,6 +365,7 @@
364365
"test/integration.shard/hot_reload_test.dart": 45,
365366
"test/integration.shard/hot_reload_with_asset_test.dart": 9,
366367
"test/integration.shard/hot_restart_with_unhandled_exception_test.dart": 9,
368+
"test/integration.shard/ios_app_with_extensions_test.dart": 60,
367369
"test/integration.shard/ios_content_validation_test.dart": 147,
368370
"test/integration.shard/isolated/dart_data_asset_conflicting_assets_test.dart": 40,
369371
"test/integration.shard/isolated/dart_data_asset_flutter_build_test.dart": 119,
@@ -580,6 +582,7 @@
580582
"test/integration.shard/hot_reload_test.dart": 83,
581583
"test/integration.shard/hot_reload_with_asset_test.dart": 16,
582584
"test/integration.shard/hot_restart_with_unhandled_exception_test.dart": 16,
585+
"test/integration.shard/ios_app_with_extensions_test.dart": 0,
583586
"test/integration.shard/ios_content_validation_test.dart": 0,
584587
"test/integration.shard/isolated/dart_data_asset_conflicting_assets_test.dart": 79,
585588
"test/integration.shard/isolated/dart_data_asset_flutter_build_test.dart": 183,

‎dev/devicelab/bin/tasks/ios_app_with_extensions_test.dart‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎docs/Flutter-Self-Service-Index.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Flutter provides multiple functionality through self-service services. Most of t
2222
<tr>
2323
<td>Flutter organization members
2424
</td>
25-
<td>[Anyone with write access to the flutter organization resources.](./contributing/Contributor-access.md)
25+
<td>[Members of the Flutter Contributor Ladder (Reviewers, Committers, and Maintainers).](./contributing/Contributor-access.md)
2626
</td>
2727
</tr>
2828
<tr>

‎docs/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ If you intend to contribute to Flutter, welcome! You are encouraged to start wit
1414
* [Breaking changes](./contributing/Tree-hygiene.md#handling-breaking-changes)
1515
* [Cherrypick process](./releases/Flutter-Cherrypick-Process.md)
1616
* [Closing issues](./contributing/issue_hygiene/README.md#closing-issues)
17+
* [Contributor access and ladder](./contributing/Contributor-access.md)
1718
* [Dashboards](./infra/Dashboards.md)
1819
* [Debugging a broken engine autoroll](../docs/engine/Debugging-the-engine.md#bisecting-a-roll-failure)
1920
* [Deprecations](./contributing/Tree-hygiene.md#deprecations)

0 commit comments

Comments
 (0)