Skip to content

Flutter 1.22.0-12.3.pre framework cherrypicks #66849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
christopherfujino merged 6 commits into from
Sep 29, 2020
Merged

Flutter 1.22.0-12.3.pre framework cherrypicks #66849

christopherfujino merged 6 commits into from
Sep 29, 2020

Conversation

@christopherfujino
Copy link
Contributor

@christopherfujino christopherfujino commented Sep 28, 2020 •
edited by pcsosinski
Loading

Scheduled Cherrypicks

@flutter-dashboard flutter-dashboard bot changed the base branch from flutter-1.22-candidate.12 to master September 28, 2020 20:10
@flutter-dashboard
Copy link

flutter-dashboard bot commented Sep 28, 2020

This pull request was opened against a branch other than master. Since Flutter pull requests should not normally be opened against branches other than master, I have changed the base to master. If this was intended, you may modify the base back to flutter-1.22-candidate.12. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master, unless this is an intentional hotfix/cherrypick.

@flutter-dashboard flutter-dashboard bot added a: tests "flutter test", flutter_test, or one of our tests engine flutter/engine related. See also e: labels. f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Sep 28, 2020
@christopherfujino christopherfujino changed the base branch from master to flutter-1.22-candidate.12 September 28, 2020 20:11
@christopherfujino christopherfujino marked this pull request as draft September 28, 2020 21:55
@flutter-dashboard flutter-dashboard bot added work in progress; do not review f: cupertino flutter/packages/flutter/cupertino repository labels Sep 28, 2020
@christopherfujino christopherfujino force-pushed the cherrypicks-flutter-1.22-candidate.12 branch from 438570b to a5273a0 Compare September 28, 2020 23:50
@christopherfujino christopherfujino force-pushed the cherrypicks-flutter-1.22-candidate.12 branch from 9f7c68e to fe39298 Compare September 29, 2020 00:15
@googlebot
Copy link

googlebot commented Sep 29, 2020

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@christopherfujino christopherfujino force-pushed the cherrypicks-flutter-1.22-candidate.12 branch from 66f71d8 to c9d70b6 Compare September 29, 2020 00:57
jmagman
jmagman approved these changes Sep 29, 2020
View reviewed changes
Copy link
Member

@jmagman jmagman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#65402 LGTM

@christopherfujino christopherfujino marked this pull request as ready for review September 29, 2020 01:07
@christopherfujino christopherfujino removed the request for review from Piinks September 29, 2020 01:08
@googlebot
Copy link

googlebot commented Sep 29, 2020

A Googler has manually verified that the CLAs look good.

(Googler, please make sure the reason for overriding the CLA status is clearly documented in these comments.)

ℹ️ Googlers: Go here for more info.

@christopherfujino
Copy link
Contributor Author

christopherfujino commented Sep 29, 2020

I manually updated the label to cla: yes because the committer in question, @xu-baolin has already signed the CLA.

@LongCatIsLooong
Copy link
Contributor

LongCatIsLooong commented Sep 29, 2020

c9d70b6 LGTM. Were there any other conflicts in editable_text.dart other than this line?

_textInputConnection.setEditingState(localValue);

jonahwilliams
jonahwilliams approved these changes Sep 29, 2020
View reviewed changes
Copy link
Contributor

@jonahwilliams jonahwilliams left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Version updates LGTM

@justinmc
Copy link
Contributor

justinmc commented Sep 29, 2020 •
edited
Loading

Another LGTM for c9d70b6. Thanks!

pcsosinski
pcsosinski approved these changes Sep 29, 2020
View reviewed changes
Copy link

@pcsosinski pcsosinski left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

approve for branch

@jmagman jmagman mentioned this pull request Sep 29, 2020
Closed
@christopherfujino christopherfujino merged commit d408d30 into flutter:flutter-1.22-candidate.12 Sep 29, 2020
@christopherfujino christopherfujino deleted the cherrypicks-flutter-1.22-candidate.12 branch September 29, 2020 18:49
This was referenced Sep 29, 2020
Closed
Closed
willlockwood pushed a commit to willlockwood/flutter that referenced this pull request Dec 25, 2020
@christopherfujino @willlarche
@goderbauer @xu-baolin @willlockwood
Flutter 1.22.0-12.3.pre framework cherrypicks (flutter#66849)
bc77b8d 
* [Icons][iOS] Pointing to version of material icon font that includes more metadata in the xml. (flutter#66684)
* apply engine cherrypicks
* Page-subclasses to take children instead of builder (flutter#66694)
* Update pub dependencies to support dart 2.10.0
* cherry-pick 76ad864
* Fix the inconsistency between the local state of the input and the engine state (flutter#65754)

Co-authored-by: Will Larche <larche@google.com>
Co-authored-by: Michael Goderbauer <goderbauer@google.com>
Co-authored-by: xubaolin <xubaolin@oppo.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jmagman jmagman jmagman approved these changes

@justinmc justinmc Awaiting requested review from justinmc

+2 more reviewers

@jonahwilliams jonahwilliams jonahwilliams approved these changes

@pcsosinski pcsosinski pcsosinski approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

a: tests "flutter test", flutter_test, or one of our tests c: contributor-productivity Team-specific productivity, code health, technical debt. engine flutter/engine related. See also e: labels. f: cupertino flutter/packages/flutter/cupertino repository f: material design flutter/packages/flutter/material repository. framework flutter/packages/flutter repository. See also f: labels. tool Affects the "flutter" command-line tool. See also t: labels.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

10 participants

@christopherfujino @googlebot @LongCatIsLooong @justinmc @jmagman @jonahwilliams @pcsosinski @willlarche @goderbauer @xu-baolin