Merged
Conversation
justinmc
approved these changes
Aug 8, 2023
Contributor
justinmc
left a comment
There was a problem hiding this comment.
LGTM 👍 I will work on relanding this after this is merged.
justinmc
previously requested changes
Aug 8, 2023
Contributor
justinmc
left a comment
There was a problem hiding this comment.
Looks like there is one merge conflict, but it should be easy to fix. I left a comment.
| } | ||
| } | ||
|
|
||
| <<<<<<< HEAD |
Contributor
There was a problem hiding this comment.
Ah nevermind, here's a merge conflict! It looks like everything in the "HEAD" block here should be deleted. It's all stuff from my PR.
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 9, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 9, 2023
auto-submit bot
pushed a commit
to flutter/packages
that referenced
this pull request
Aug 9, 2023
flutter/flutter@436df69...f4c25bb 2023-08-09 [email protected] Revert "Handle breaking changes in leak_tracker." (flutter/flutter#132223) 2023-08-09 [email protected] Roll Flutter Engine from 8ec575168d44 to 3d3fb4faed02 (3 revisions) (flutter/flutter#132193) 2023-08-09 [email protected] Use pattern matching to avoid strange type annotations (flutter/flutter#131964) 2023-08-09 [email protected] Roll Flutter Engine from 6839b88283b6 to 8ec575168d44 (1 revision) (flutter/flutter#132182) 2023-08-09 [email protected] Roll Flutter Engine from 29b117aa4192 to 6839b88283b6 (1 revision) (flutter/flutter#132181) 2023-08-09 [email protected] Roll Flutter Engine from 82292b8390cb to 29b117aa4192 (5 revisions) (flutter/flutter#132179) 2023-08-09 [email protected] Add more info to `OverlayState.insert` error messages (flutter/flutter#129363) 2023-08-08 [email protected] Add `textCapitalization` property for `SearchBar` and `SearchAnchor` (flutter/flutter#131459) 2023-08-08 [email protected] Roll Flutter Engine from 934ebb005d02 to 82292b8390cb (3 revisions) (flutter/flutter#132166) 2023-08-08 49699333+dependabot[bot]@users.noreply.github.com Bump github/codeql-action from 2.21.2 to 2.21.3 (flutter/flutter#132165) 2023-08-08 [email protected] Revert of #120385 (flutter/flutter#132167) 2023-08-08 [email protected] Add `PopupMenuButton.iconColor`, `PopupMenuTheme.iconSize` and fix button icon using unexpected color propert (flutter/flutter#132054) 2023-08-08 [email protected] More PageStorage clarity in the documentation (flutter/flutter#131954) 2023-08-08 [email protected] Document that missed_frame_build_budget_count is misleading (flutter/flutter#132137) 2023-08-08 [email protected] Locate the template directory using a TemplatePathProvider. (flutter/flutter#132156) 2023-08-08 [email protected] Roll Flutter Engine from dd03fae51d38 to 934ebb005d02 (4 revisions) (flutter/flutter#132159) 2023-08-08 [email protected] Roll Flutter Engine from 22bd35a19352 to dd03fae51d38 (3 revisions) (flutter/flutter#132149) 2023-08-08 [email protected] Fix `TabBarTheme.indicatorColor` not applied in Material 2 (flutter/flutter#132123) 2023-08-08 [email protected] Paginated Data Table : Fixed Row number at footer in last page (flutter/flutter#130389) 2023-08-08 [email protected] [web] Use benchmark callback from `dart:ui_web` (flutter/flutter#132087) 2023-08-08 [email protected] Roll Flutter Engine from 99fdac88f3c6 to 22bd35a19352 (3 revisions) (flutter/flutter#132141) 2023-08-08 [email protected] [framework] Add Search Web to selection controls for iOS (flutter/flutter#131898) 2023-08-08 [email protected] Remove Iterator from _History (flutter/flutter#132101) 2023-08-08 [email protected] Update dartdoc driver to match current behaviour (flutter/flutter#132078) 2023-08-08 [email protected] More documentation about warm-up frames (flutter/flutter#132085) 2023-08-08 [email protected] Roll Flutter Engine from 146c4c9487fc to 99fdac88f3c6 (3 revisions) (flutter/flutter#132135) 2023-08-08 [email protected] Roll Packages from d7ee75a to ac41376 (8 revisions) (flutter/flutter#132133) 2023-08-08 [email protected] Handle breaking changes in leak_tracker. (flutter/flutter#131998) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected],[email protected],[email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
CaseyHillers
pushed a commit
that referenced
this pull request
Aug 9, 2023
Breaking google testing revert of: #120385 b/295065534 *Replace this paragraph with a description of what this PR is changing or adding, and why. Consider including before/after screenshots.* *List which issues are fixed by this PR. You must list at least one issue.* *If you had to change anything in the [flutter/tests] repo, include a link to the migration guide as per the [breaking change policy].* ## Pre-launch Checklist - [ ] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [ ] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [ ] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [ ] I signed the [CLA]. - [ ] 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]. - [ ] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/wiki/Tree-hygiene#overview [Tree Hygiene]: https://github.com/flutter/flutter/wiki/Tree-hygiene [test-exempt]: https://github.com/flutter/flutter/wiki/Tree-hygiene#tests [Flutter Style Guide]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo [Features we expect every widget to implement]: https://github.com/flutter/flutter/wiki/Style-guide-for-Flutter-repo#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [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 Co-authored-by: Jesús S Guerrero <[email protected]>
CaseyHillers
pushed a commit
to CaseyHillers/flutter
that referenced
this pull request
Aug 9, 2023
Breaking google testing revert of: flutter#120385 b/295065534
justinmc
added a commit
that referenced
this pull request
Aug 9, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Nov 15, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Breaking google testing
revert of: #120385
b/295065534