Visitar URL original
Merge remote-tracking branch 'upstream/master' into handle#6537-Badge · flutter/flutter@bd16d25 · GitHub
Skip to content

Commit bd16d25

Browse files
committed
Merge remote-tracking branch 'upstream/master' into handle#6537-Badge
2 parents a558c41 + 9de63a0 commit bd16d25

736 files changed

Lines changed: 16941 additions & 9611 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.

‎.autoroller-preupload.sh‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#!/usr/bin/env bash
2+
# Copyright 2014 The Flutter Authors. All rights reserved.
3+
# Use of this source code is governed by a BSD-style license that can be
4+
# found in the LICENSE file.
5+
6+
set -e
7+
8+
# This is executed by the skia autoroller after the roll has happened but before
9+
# the PR is uploaded. Previously this logic was hardcoded into the autoroller
10+
# and was reserved for updating the LICENSE file. Now the autoroller delegates
11+
# to this script.
12+
# See also:
13+
# - https://skia-review.googlesource.com/c/buildbot/+/1025936
14+
# - https://issues.skia.org/issues/433551375
15+
16+
REPO_PATH=$(dirname "$(readlink -f "$0")")
17+
PROFILE_PATH="$REPO_PATH/engine/src/out/host_profile"
18+
GN="$REPO_PATH/engine/src/flutter/tools/gn"
19+
LICENSE_CPP="$REPO_PATH/engine/src/out/host_profile/licenses_cpp"
20+
WORKING_DIR="$REPO_PATH/engine/src/flutter"
21+
LICENSES_PATH="$REPO_PATH/engine/src/flutter/sky/packages/sky_engine/LICENSE"
22+
DATA_PATH="$REPO_PATH/engine/src/flutter/tools/licenses_cpp/data"
23+
24+
# This calls `gn gen`.
25+
"$GN" --runtime-mode profile --no-goma --no-rbe --enable-minimal-linux
26+
ninja -C "$PROFILE_PATH" licenses_cpp
27+
"$LICENSE_CPP" \
28+
--working_dir="$WORKING_DIR" \
29+
--licenses_path="$LICENSES_PATH" \
30+
--data_dir="$DATA_PATH" \
31+
--v=1

‎.ci.yaml‎

Lines changed: 16 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ platform_properties:
155155
]
156156
dependencies: >-
157157
[
158-
{"dependency": "apple_signing", "version": "version:to_2025"}
158+
{"dependency": "apple_signing", "version": "version:to_2026"}
159159
]
160160
os: Mac-14|Mac-15
161161
device_type: none
@@ -172,7 +172,7 @@ platform_properties:
172172
]
173173
dependencies: >-
174174
[
175-
{"dependency": "apple_signing", "version": "version:to_2025"}
175+
{"dependency": "apple_signing", "version": "version:to_2026"}
176176
]
177177
os: Mac-14|Mac-15
178178
device_type: none
@@ -190,7 +190,7 @@ platform_properties:
190190
]
191191
dependencies: >-
192192
[
193-
{"dependency": "apple_signing", "version": "version:to_2025"}
193+
{"dependency": "apple_signing", "version": "version:to_2026"}
194194
]
195195
device_type: none
196196
mac_model: "Macmini8,1"
@@ -210,7 +210,7 @@ platform_properties:
210210
]
211211
dependencies: >-
212212
[
213-
{"dependency": "apple_signing", "version": "version:to_2025"}
213+
{"dependency": "apple_signing", "version": "version:to_2026"}
214214
]
215215
os: Mac-14|Mac-15
216216
device_type: none
@@ -229,7 +229,7 @@ platform_properties:
229229
dependencies: >-
230230
[
231231
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
232-
{"dependency": "apple_signing", "version": "version:to_2025"}
232+
{"dependency": "apple_signing", "version": "version:to_2026"}
233233
]
234234
os: Mac-14|Mac-15
235235
device_type: none
@@ -271,7 +271,7 @@ platform_properties:
271271
dependencies: >-
272272
[
273273
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
274-
{"dependency": "apple_signing", "version": "version:to_2025"}
274+
{"dependency": "apple_signing", "version": "version:to_2026"}
275275
]
276276
os: Mac-14|Mac-15
277277
device_os: iOS-17|iOS-18
@@ -289,7 +289,7 @@ platform_properties:
289289
dependencies: >-
290290
[
291291
{"dependency": "ruby", "version": "ruby_3.1-pod_1.13"},
292-
{"dependency": "apple_signing", "version": "version:to_2025"}
292+
{"dependency": "apple_signing", "version": "version:to_2026"}
293293
]
294294
os: Mac-14|Mac-15
295295
cpu: x86
@@ -589,10 +589,8 @@ targets:
589589
]
590590
tags: >
591591
["framework", "hostonly", "linux"]
592-
validation: docs
593-
validation_name: Docs
594-
firebase_project: main-docs-flutter-prod
595-
release_ref: refs/heads/master
592+
docs: >
593+
{"build": "master", "deploy": "main-docs-flutter-prod"}
596594
drone_dimensions:
597595
- os=Linux
598596

@@ -615,13 +613,8 @@ targets:
615613
]
616614
tags: >
617615
["framework", "hostonly", "linux"]
618-
validation: docs
619-
validation_name: Docs
620-
# TODO(matanlurey): Neither of these properties are actually used, since
621-
# the branch name is not "master", but if they are removed, the recipe
622-
# will fail. See https://github.com/flutter/flutter/issues/169108.
623-
firebase_project: main-docs-flutter-prod
624-
release_ref: refs/heads/master
616+
docs: >
617+
{"build": "stable"}
625618
drone_dimensions:
626619
- os=Linux
627620

@@ -647,9 +640,8 @@ targets:
647640
]
648641
tags: >
649642
["framework", "hostonly", "linux"]
650-
validation: docs_deploy
651-
validation_name: Docs_deploy
652-
firebase_project: docs-flutter-dev
643+
docs: >
644+
{"post_process": "stable", "deploy": "docs-flutter-dev"}
653645
drone_dimensions:
654646
- os=Linux
655647

@@ -1186,7 +1178,6 @@ targets:
11861178
- name: Linux linux_feature_flags_test
11871179
recipe: devicelab/devicelab_drone
11881180
timeout: 60
1189-
bringup: true
11901181
presubmit: false
11911182
properties:
11921183
xvfb: "1"
@@ -1528,7 +1519,7 @@ targets:
15281519
- engine/**
15291520
- DEPS
15301521

1531-
- name: Linux android_java11_tool_integration_tests
1522+
- name: Linux android_java17_tool_integration_tests
15321523
recipe: flutter/flutter_drone
15331524
timeout: 60
15341525
properties:
@@ -1541,9 +1532,9 @@ targets:
15411532
{"dependency": "cmake", "version": "build_id:8787856497187628321"},
15421533
{"dependency": "goldctl", "version": "git_revision:2387d6fff449587eecbb7e45b2692ca0710b63b9"},
15431534
{"dependency": "ninja", "version": "version:1.9.0"},
1544-
{"dependency": "open_jdk", "version": "version:11"}
1535+
{"dependency": "open_jdk", "version": "version:17"}
15451536
]
1546-
shard: android_java11_tool_integration_tests
1537+
shard: android_java17_tool_integration_tests
15471538
tags: >
15481539
["framework", "hostonly", "shard", "linux"]
15491540
test_timeout_secs: "2700"
@@ -2336,21 +2327,11 @@ targets:
23362327
- name: Linux_android_emu_unstable android_defines_test
23372328
recipe: devicelab/devicelab_drone
23382329
timeout: 60
2339-
bringup: true
23402330
properties:
23412331
tags: >
23422332
["devicelab", "linux"]
23432333
task_name: android_defines_test
23442334

2345-
- name: Linux_pixel_7pro android_obfuscate_test
2346-
recipe: devicelab/devicelab_drone
2347-
presubmit: false
2348-
timeout: 60
2349-
properties:
2350-
tags: >
2351-
["devicelab", "android", "linux", "pixel", "7pro"]
2352-
task_name: android_obfuscate_test
2353-
23542335
- name: Linux_pixel_7pro android_semantics_integration_test
23552336
recipe: devicelab/devicelab_drone
23562337
bringup: true # Failing: https://github.com/flutter/flutter/issues/153594
@@ -3134,7 +3115,6 @@ targets:
31343115

31353116
# linux mokey benchmark
31363117
- name: Linux_mokey new_gallery__crane_perf
3137-
bringup: true # Flaky https://github.com/flutter/flutter/issues/165963
31383118
recipe: devicelab/devicelab_drone
31393119
presubmit: false
31403120
timeout: 60
@@ -5103,7 +5083,6 @@ targets:
51035083
- name: Mac_arm64_ios imitation_game_flutter
51045084
recipe: devicelab/devicelab_drone
51055085
presubmit: false
5106-
bringup: true
51075086
timeout: 60
51085087
properties:
51095088
tags: >
@@ -5697,7 +5676,6 @@ targets:
56975676

56985677
- name: Mac_ios keyboard_hot_restart_ios
56995678
recipe: devicelab/devicelab_drone
5700-
bringup: true
57015679
presubmit: false
57025680
timeout: 60
57035681
properties:
@@ -6211,7 +6189,6 @@ targets:
62116189
- DEPS
62126190

62136191
- name: Windows plugin_test
6214-
bringup: true # Flaky https://github.com/flutter/flutter/issues/148834
62156192
recipe: devicelab/devicelab_drone
62166193
timeout: 60
62176194
properties:

‎.gemini/config.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Minimize verbosity.
2+
have_fun: false
3+
code_review:
4+
# For now, use the default of MEDIUM for testing. Based on desired verbosity,
5+
# we can change this to LOW or HIGH in the future.
6+
comment_severity_threshold: MEDIUM
7+
pull_request_opened:
8+
# Explicitly set help to false in case the default changes in the future, as
9+
# having a help message on every PR would be spammy.
10+
help: false
11+
# These tend to be verbose, and since we expect PR authors to clearly
12+
# describe their PRs this would be at best duplicative.
13+
summary: false
14+
ignore_patterns:
15+
# Avoid code reviews on rolls.
16+
- DEPS
17+
- "bin/internal/*.version"
18+
- "engine/src/flutter/ci/licenses_golden/**"
19+
# Avoid code reviews on all third_party files.
20+
- "**/third_party/**"

‎.gemini/styleguide.md‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
# Flutter Style Guide
2+
3+
This style guide outlines the coding conventions for contributions to the
4+
flutter/flutter repository. It is based on the more comprehensive official
5+
[style guide for the Flutter repository](https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md).
6+
7+
## Best Practices
8+
- Code should follow the guidance and principles described in
9+
[the Flutter contribution guide](https://github.com/flutter/flutter/blob/main/CONTRIBUTING.md).
10+
- Code should be tested and follow the guidance described in the [writing effective tests guide](https://github.com/flutter/flutter/blob/main/docs/contributing/testing/Writing-Effective-Tests.md) and the [running and writing tests guide](https://github.com/flutter/flutter/blob/main/docs/contributing/testing/Running-and-writing-tests.md).
11+
- Changes to the [engine/ directory](https://github.com/flutter/flutter/tree/main/engine) should additionally have appropriate tests as described in [the engine test guidance](https://github.com/flutter/flutter/blob/main/engine/src/flutter/docs/testing/Testing-the-engine.md).
12+
- PR descriptions should include the Pre-launch Checklist from
13+
[the PR template](https://github.com/flutter/flutter/blob/main/.github/PULL_REQUEST_TEMPLATE.md),
14+
with all of the steps completed.
15+
16+
## General Philosophy
17+
18+
- **Optimize for readability**: Code is read more often than it is written.
19+
- **Avoid duplicating state**: Keep only one source of truth.
20+
- Write what you need and no more, but when you write it, do it right.
21+
- **Error messages should be useful**: Every error message is an opportunity to make someone love our product.
22+
23+
## Dart Formatting
24+
25+
- All Dart code is formatted using `dart format`. This is enforced by CI.
26+
- Constructors come first in a class definition, with the default constructor preceding named constructors.
27+
- Other class members should be ordered logically (e.g., by lifecycle, or grouping related fields and methods).
28+
29+
## Miscellaneous Languages
30+
31+
- Python code is formatted using `yapf`, linted with `pylint`, and should follow the [Google Python Style Guide](https://google.github.io/styleguide/pyguide.html).
32+
- C++ code is formatted using `clang-format`, linted with `clang-tidy`, and should follow the [Google C++ Style Guide](https://google.github.io/styleguide/cppguide.html).
33+
- Shaders are formatted using `clang-format`.
34+
- Kotlin code is formatted using `ktformat`, linted with `ktlint`, and should follow the [Android Kotlin Style Guide](https://developer.android.com/kotlin/style-guide).
35+
- Java code is formatted using `google-java-format` and should follow the [Google Java Style Guide](https://google.github.io/styleguide/javaguide.html).
36+
- Objective-C is formatted using `clang-format`, linted with `clang-tidy`, and should follow the [Google Objective-C Style Guide](https://google.github.io/styleguide/objcguide.html).
37+
- Swift is formatted and linted using `swift-format` and should follow the [Google Swift Style Guide](https://google.github.io/swift).
38+
- GN code is formatted using `gn format` and should follow the [GN Style Guide](https://gn.googlesource.com/gn/+/main/docs/style_guide.md).
39+
40+
## Documentation
41+
42+
- All public members should have documentation.
43+
- **Answer your own questions**: If you have a question, find the answer, and then document it where you first looked.
44+
- **Documentation should be useful**: Explain the *why* and the *how*.
45+
- **Introduce terms**: Assume the reader does not know everything. Link to definitions.
46+
- **Provide sample code**: Use `{@tool dartpad}` for runnable examples.
47+
- Inline code samples are contained within `{@tool dartpad}` and `{@end-tool}`, and use the format of the following example to insert the code sample:
48+
- `/// ** See code in examples/api/lib/widgets/sliver/sliver_list.0.dart **`
49+
- Do not confuse this format with `/// See also:` sections of the documentation, which provide helpful breadcrumbs to developers.
50+
- **Provide illustrations or screenshots** for widgets.
51+
- Use `///` for public-quality documentation, even on private members.
52+
53+
## Further Reading
54+
55+
For more detailed guidance, refer to the following documents:
56+
57+
- [Style guide for the Flutter repository](https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md)
58+
- [Effective Dart: Style](https://dart.dev/effective-dart/style)
59+
- [Tree Hygiene](https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md)
60+
- [The Flutter contribution guide](https://github.com/flutter/flutter/blob/main/CONTRIBUTING.md)
61+
- [Writing effective tests guide](https://github.com/flutter/flutter/blob/main/docs/contributing/testing/Writing-Effective-Tests.md)
62+
- [Running and writing tests guide](https://github.com/flutter/flutter/blob/main/docs/contributing/testing/Running-and-writing-tests.md)
63+
- [Engine testing guide](https://github.com/flutter/flutter/blob/main/engine/src/flutter/docs/testing/Testing-the-engine.md)

‎.github/PULL_REQUEST_TEMPLATE.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ To learn more about code review, see our documentation on Tree Hygiene: https://
2424

2525
If you need help, consider asking for advice on the #hackers-new channel on [Discord].
2626

27+
**Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.
28+
2729
<!-- Links -->
2830
[Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview
2931
[Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,11 @@ jobs:
1313
- name: Checkout code
1414
uses: actions/checkout@v4
1515

16-
- name: Fetch base commit and origin/master
17-
run: |
18-
git fetch --no-tags --prune --depth=1 origin ${{ github.event.pull_request.base.sha }}
19-
2016
- name: Generate Hash
2117
run: |
22-
engine_content_hash=$(bin/internal/content_aware_hash.sh)
18+
# IMPORTANT: Keep the list of files in sync with bin/internal/content_aware_hash.sh
19+
# We call this directly here as we're expected to be in the merge queue (not master)
20+
engine_content_hash=$(git ls-tree --format "%(objectname) %(path)" HEAD -- DEPS engine bin/internal/release-candidate-branch.version | git hash-object --stdin)
2321
# test notice annotation for retrival from api
2422
echo "::notice ::{\"engine_content_hash\": \"${engine_content_hash}\"}"
2523
# test summary writing

‎CHANGELOG.md‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,13 @@ docs/releases/Hotfix-Documentation-Best-Practices.md
3131
-->
3232
## Flutter 3.32 Changes
3333

34+
### [3.32.8](https://github.com/flutter/flutter/releases/tag/3.32.8)
35+
36+
- [flutter/150131](https://github.com/flutter/flutter/issues/150131) iOS users on macOS 15 may see a tool crash if permissions are missing. Can work around by enabling mDNS permissions.
37+
- [flutter/155294](https://github.com/flutter/flutter/issues/155294) [flutter/169506](https://github.com/flutter/flutter/issues/169506) On android Add a new api for requesting a new surface from the embedder that is different from any previously returned.
38+
- [flutter/172602](https://github.com/flutter/flutter/pull/172602) Do not call hasUnifiedMemory that was introduced in macOS 10.15 on versions before 10.15.
39+
- [flutter/172250](https://github.com/flutter/flutter/issues/172250) `TextInput.hide` call incorrectly clears the text in the active text field on iOS.
40+
3441
### [3.32.7](https://github.com/flutter/flutter/releases/tag/3.32.7)
3542

3643
- [flutter/172121](https://github.com/flutter/flutter/pull/172121) - Fix iOS images replaced with pink fill when coming out of background.

‎CODEOWNERS‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
# The following files define an Application Binary Interface (ABI) that must maintain
3030
# both forward and backward compatibility. Changes should be heavily
3131
# scrutinized as mistakes are irreversible.
32-
/engine/src/flutter/shell/platform/embedder/embedder.h @cbracken @chinmaygarde @loic-sharma
33-
/engine/src/flutter/shell/platform/embedder/tests/embedder_frozen.h @cbracken @chinmaygarde @loic-sharma
32+
/engine/src/flutter/shell/platform/embedder/embedder.h @chinmaygarde @loic-sharma
33+
/engine/src/flutter/shell/platform/embedder/tests/embedder_frozen.h @chinmaygarde @loic-sharma
3434

3535
# Android team - keep this synced with .github/labeler.yml's team-android section.
3636
/docs/platform/android/** @flutter/android-reviewers

0 commit comments

Comments
 (0)