Skip to content

Commit

Permalink
Merge branch 'master' into fix/gridview_delegate
Browse files Browse the repository at this point in the history
* master: (2580 commits)
  plugin_ffi template comment fix (flutter#148378)
  Roll Flutter Engine from 942d7c35de75 to 9e17588b330c (2 revisions) (flutter#148455)
  Reland fix TextField helper top padding on M3 (flutter#146754)
  Removing duplicate assert on `VisualDensity` constructor (flutter#148281)
  Roll Flutter Engine from 65ac4bf96ed7 to 942d7c35de75 (1 revision) (flutter#148450)
  Roll Flutter Engine from c11d64be5102 to 65ac4bf96ed7 (3 revisions) (flutter#148448)
  Roll Flutter Engine from f6195e9d4b4b to c11d64be5102 (1 revision) (flutter#148445)
  Roll Flutter Engine from cd150986ae63 to f6195e9d4b4b (2 revisions) (flutter#148441)
  Fix leaky tests. (flutter#148434)
  Roll Flutter Engine from 41b86b59f0ab to cd150986ae63 (2 revisions) (flutter#148430)
  Roll Flutter Engine from bf1c6da0dd31 to 41b86b59f0ab (15 revisions) (flutter#148428)
  Update _handlePushRouteInformation to Future<bool>  to indicate whether any of the observer has handled the route or not (flutter#147901)
  Fix memory leaks in `_PopupMenuRoute` (flutter#148373)
  Add `clipBehavior` to `DrawerThemeData` (flutter#148061)
  Reland Native ios context menu (flutter#143002) (flutter#148238) (flutter#148265)
  Roll Packages from fd714bd7d516 to 87a02e393be0 (8 revisions) (flutter#148419)
  Stop running module_test_ios in devicelab and x64 Macs (flutter#148264)
  Roll Flutter Engine from d35a1a603c80 to bf1c6da0dd31 (1 revision) (flutter#148369)
  Roll Flutter Engine from 55c62ff82c7e to d35a1a603c80 (4 revisions) (flutter#148367)
  Roll Flutter Engine from a1d930a3a84d to 55c62ff82c7e (3 revisions) (flutter#148365)
  ...
  • Loading branch information
hello-coder-xu committed May 16, 2024
2 parents 2b7a8e3 + 8a4179e commit e75b224
Show file tree
Hide file tree
Showing 3,350 changed files with 198,919 additions and 65,819 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
1,529 changes: 1,034 additions & 495 deletions .ci.yaml

Large diffs are not rendered by default.

17 changes: 7 additions & 10 deletions .github/ISSUE_TEMPLATE/1_activation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@ body:
If you have found a bug or if our documentation doesn't have an answer
to what you're looking for, then fill out the template below.
- type: checkboxes
- type: markdown
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the [existing issues](https://github.com/flutter/flutter/issues)
required: true
- label: I have read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
required: true
value: |
Before filling the form fields, please consider the following:
- Ensure that you have searched the [existing issues](https://github.com/flutter/flutter/issues)
- Read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
- type: textarea
attributes:
label: Steps to reproduce
Expand Down Expand Up @@ -58,7 +55,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks
or the above mentioned ways to upload logs.
value: |
<details>
<details open>
<summary>Logs</summary>
```console
Expand All @@ -74,7 +71,7 @@ body:
description: |
Please provide the full output of running `flutter doctor -v`
value: |
<details>
<details open>
<summary>Doctor output</summary>
```console
Expand Down
20 changes: 9 additions & 11 deletions .github/ISSUE_TEMPLATE/2_bug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ body:
- https://flutter.dev/
- https://api.flutter.dev/
- https://stackoverflow.com/questions/tagged/flutter?sort=frequent
- type: checkboxes
- type: markdown
attributes:
label: Is there an existing issue for this?
options:
- label: I have searched the [existing issues](https://github.com/flutter/flutter/issues)
required: true
- label: I have read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
required: true
value: |
Before filling the form fields, please consider the following:
- Ensure that you have searched the [existing issues](https://github.com/flutter/flutter/issues)
- Read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
- type: textarea
attributes:
label: Steps to reproduce
Expand Down Expand Up @@ -62,7 +60,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks
or the above mentioned ways to upload your code sample.
value: |
<details><summary>Code sample</summary>
<details open><summary>Code sample</summary>
```dart
[Paste your code here]
Expand All @@ -77,7 +75,7 @@ body:
description: |
Upload any screenshots or video of the bug if applicable.
value: |
<details>
<details open>
<summary>Screenshots / Video demonstration</summary>
[Upload media here]
Expand All @@ -99,7 +97,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks
or the above mentioned ways to upload logs.
value: |
<details><summary>Logs</summary>
<details open><summary>Logs</summary>
```console
[Paste your logs here]
Expand All @@ -112,7 +110,7 @@ body:
description: |
Please provide the full output of running `flutter doctor -v`
value: |
<details><summary>Doctor output</summary>
<details open><summary>Doctor output</summary>
```console
[Paste your output here]
Expand Down
13 changes: 5 additions & 8 deletions .github/ISSUE_TEMPLATE/3_feature_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,12 @@ body:
- https://flutter.dev/
- https://api.flutter.dev/
- https://stackoverflow.com/questions/tagged/flutter?sort=frequent
- type: checkboxes
- type: markdown
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for this feature request or proposal.
options:
- label: I have searched the [existing issues](https://github.com/flutter/flutter/issues)
required: true
- label: I have read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
required: true
value: |
Before filling the form fields, please consider the following:
- Ensure that you have searched the [existing issues](https://github.com/flutter/flutter/issues)
- Read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
- type: textarea
attributes:
label: Use case
Expand Down
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/4_performance_others.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks or the above mentioned ways to upload your code sample.
value: |
<details><summary>Code sample</summary>
<details open><summary>Code sample</summary>
```dart
[Paste your code here]
Expand Down Expand Up @@ -90,7 +90,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks or the above mentioned ways to upload logs.
value: |
<details><summary>Logs</summary>
<details open><summary>Logs</summary>
```console
[Paste your logs here]
Expand All @@ -103,7 +103,7 @@ body:
description: |
Finally, paste the output of running `flutter doctor -v` here, with your device plugged in.
value: |
<details><summary>Doctor output</summary>
<details open><summary>Doctor output</summary>
```console
[Paste your output here]
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/5_performance_speed.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks or the above mentioned ways to upload your code sample.
value: |
<details><summary>Code sample</summary>
<details open><summary>Code sample</summary>
```dart
[Paste your code here]
Expand Down Expand Up @@ -71,7 +71,7 @@ body:
If the trace are too large to be uploaded to GitHub, you may upload them as a `zip` file or use online tools like https://pastebin.com to share it.
value: |
<details><summary>Timeline Traces JSON</summary>
<details open><summary>Timeline Traces JSON</summary>
```json
[Paste the Timeline Traces here]
Expand All @@ -88,7 +88,7 @@ body:
Don’t use "adb screenrecord", as that affects the performance of the profile run.
value: |
<details>
<details open>
<summary>Video demonstration</summary>
[Upload media here]
Expand Down Expand Up @@ -148,7 +148,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks or the above mentioned ways to upload logs.
value: |
<details><summary>Logs</summary>
<details open><summary>Logs</summary>
```console
[Paste your logs here]
Expand All @@ -161,7 +161,7 @@ body:
description: |
Finally, paste the output of running `flutter doctor -v` here, with your device plugged in.
value: |
<details><summary>Doctor output</summary>
<details open><summary>Doctor output</summary>
```console
[Paste your output here]
Expand Down
8 changes: 3 additions & 5 deletions .github/ISSUE_TEMPLATE/6_infrastructure.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,10 @@ body:
It looks like you found an issue with our Infrastructure services.
Please complete the form below so that we can help to resolve your
issue as quickly as possible.
- type: checkboxes
- type: markdown
attributes:
label: Is there an existing issue for this?
options:
- label: I have searched the [existing infra issues](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3Ateam-infra)
required: true
value: |
Before filling the form fields, please ensure that you have searched the [existing infra issues](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3Ateam-infra)
- type: dropdown
attributes:
label: Type of Request
Expand Down
14 changes: 5 additions & 9 deletions .github/ISSUE_TEMPLATE/7_cherry_pick.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,16 @@ description: As a contributor, you would like to request that a feature be cherr
title: '[CP] <title>'
labels: ['cp: review']
body:
- type: markdown
attributes:
value: "### The current branches can be found under release-candidate-branch.version for [beta](https://github.com/flutter/flutter/blob/beta/bin/internal/release-candidate-branch.version) and [stable](https://github.com/flutter/flutter/blob/stable/bin/internal/release-candidate-branch.version)"
- type: input
id: issue_link
attributes:
label: Issue Link
description: What is the link to the issue this cherry-pick is addressing?
validations:
required: true
- type: input
id: commit_hash
attributes:
label: Commit Hash
description: What is the shortened commit hash that has been merged to master/main?
validations:
required: true
- type: dropdown
id: Target
attributes:
Expand All @@ -33,15 +29,15 @@ body:
label: PR Link
description: >-
Link to an open PR that cherrypick's this into the target release branch.
The current branches can be found under release-caniddate-branch.version for [beta](https://github.com/flutter/flutter/blob/beta/bin/internal/release-candidate-branch.version) and [stable](https://github.com/flutter/flutter/blob/stable/bin/internal/release-candidate-branch.version)
The current branches can be found under release-candidate-branch.version for [beta](https://github.com/flutter/flutter/blob/beta/bin/internal/release-candidate-branch.version) and [stable](https://github.com/flutter/flutter/blob/stable/bin/internal/release-candidate-branch.version)
validations:
required: true
- type: textarea
id: changelog_description
attributes:
label: Changelog Description
description: >-
Explain this CP in one line that is accessible to most Flutter developers
Explain this CP in less than 80 characters that is accessible to most Flutter developers
See https://github.com/flutter/flutter/wiki/Hotfix-Documentation-Best-Practices for examples
validations:
required: true
Expand Down
20 changes: 9 additions & 11 deletions .github/ISSUE_TEMPLATE/9_first_party_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,12 @@ body:
- https://flutter.dev/
- https://api.flutter.dev/
- https://stackoverflow.com/questions/tagged/flutter?sort=frequent
- type: checkboxes
- type: markdown
attributes:
label: Is there an existing issue for this?
options:
- label: I have searched the [existing package issues](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3Apackage)
required: true
- label: I have read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
required: true
value: |
Before filling the form fields, please consider the following:
- Ensure that you have searched the [existing package issues](https://github.com/flutter/flutter/issues?q=is%3Aopen+is%3Aissue+label%3Apackage)
- Read the [guide to filing a bug](https://flutter.dev/docs/resources/bug-reports)
- type: dropdown
id: packages
attributes:
Expand Down Expand Up @@ -164,7 +162,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks
or the above mentioned ways to upload your code sample.
value: |
<details><summary>Code sample</summary>
<details open><summary>Code sample</summary>
```dart
[Paste your code here]
Expand All @@ -179,7 +177,7 @@ body:
description: |
Upload any screenshots or videos of the bug if applicable.
value: |
<details>
<details open>
<summary>Screenshots / Video demonstration</summary>
[Upload media here]
Expand All @@ -201,7 +199,7 @@ body:
Note: Please do not upload screenshots of text. Instead, use code blocks
or the above mentioned ways to upload logs.
value: |
<details><summary>Logs</summary>
<details open><summary>Logs</summary>
```console
[Paste your logs here]
Expand All @@ -214,7 +212,7 @@ body:
description: |
Please provide the full output of running `flutter doctor -v`
value: |
<details><summary>Doctor output</summary>
<details open><summary>Doctor output</summary>
```console
[Paste your output here]
Expand Down
40 changes: 40 additions & 0 deletions .github/PR_TEMPLATE/PULL_REQUEST_CP_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
This pull request is created by [automatic cherry pick workflow](https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process#automatically-creates-a-cherry-pick-request)
Please fill in the form below, and a flutter domain expert will evaluate this cherry pick request.

### Issue Link:
What is the link to the issue this cherry-pick is addressing?

< Replace with issue link here >

### Changelog Description:
Explain this cherry pick in one line that is accessible to most Flutter developers. See [best practices](https://github.com/flutter/flutter/wiki/Hotfix-Documentation-Best-Practices) for examples

< Replace with changelog description here >

### Impact Description:
What is the impact (ex. visual jank on Samsung phones, app crash, cannot ship an iOS app)? Does it impact development (ex. flutter doctor crashes when Android Studio is installed), or the shipping production app (the app crashes on launch)

< Replace with impact description here >

### Workaround:
Is there a workaround for this issue?

< Replace with workaround here >

### Risk:
What is the risk level of this cherry-pick?

- [ ] Low
- [ ] Medium
- [ ] High

### Test Coverage:
Are you confident that your fix is well-tested by automated tests?

- [ ] Yes
- [ ] No

### Validation Steps:
What are the steps to validate that this fix works?

< Replace with validation steps here >
2 changes: 2 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
- [ ] I listed at least one issue that this PR fixes in the description above.
- [ ] I updated/added relevant documentation (doc comments with `///`).
- [ ] I added new tests to check the change I am making, or this PR is [test-exempt].
- [ ] I followed the [breaking change policy] and added [Data Driven Fixes] where supported.
- [ ] All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on [Discord].
Expand All @@ -27,3 +28,4 @@ If you need help, consider asking for advice on the #hackers-new channel on [Dis
[flutter/tests]: https://github.com/flutter/tests
[breaking change policy]: https://github.com/flutter/flutter/wiki/Tree-hygiene#handling-breaking-changes
[Discord]: https://github.com/flutter/flutter/wiki/Chat
[Data Driven Fixes]: https://github.com/flutter/flutter/wiki/Data-driven-Fixes
11 changes: 6 additions & 5 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ updates:
interval: "weekly"
reviewers:
- "christopherfujino"
- "vashworth"
- "jmagman"
- "keyonghan"
- "yusuf-goog"
labels:
- "team"
- "team-infra"
Expand All @@ -21,9 +20,9 @@ updates:
schedule:
interval: "weekly"
reviewers:
- "keyonghan"
- "yusuf-goog"
- "christopherfujino"
- "jmagman"
- "keyonghan"
labels:
- "team"
- "team-infra"
Expand All @@ -33,7 +32,9 @@ updates:
schedule:
interval: "daily"
reviewers:
- "godofredoc"
- "christopherfujino"
- "jmagman"
- "keyonghan"
labels:
- "team"
- "team-infra"
Expand Down

0 comments on commit e75b224

Please sign in to comment.