Cherry-pick #28846 and #28743 into flutter-2.6-candidate.11 #28937

xster · 2021-09-29T18:43:46Z

Fixes FlutterSemanticsScrollView to not implement accessibility conta… #28846
Set MinimumOSVersion in iOS Info.plist based on buildroot setting #28743
Replace jcenter() for mavenCentral() #28777 <-- not requested but infra change to make the tests pass
Update build.gradle #28738 <-- same

flutter-dashboard · 2021-09-29T18:43:48Z

This pull request was opened from and to a release candidate branch. This should only be done as part of the official Flutter release process. If you are attempting to make a regular contribution to the Flutter project, please close this PR and follow the instructions at Tree Hygiene for detailed instructions on contributing to Flutter.

Reviewers: Use caution before merging pull requests to release branches. Ensure the proper procedure has been followed.

flutter-dashboard · 2021-09-29T18:43:49Z

It looks like this pull request may not have tests. Please make sure to add tests before merging. If you need an exemption to this rule, contact Hixie on the #hackers channel in Chat.

If you are not sure if you need tests, consider this rule of thumb: the purpose of a test is to make sure someone doesn't accidentally revert the fix. Ask yourself, is there anything in your PR that you feel it is important we not accidentally revert back to how it was before your fix?

Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing.

xster · 2021-09-29T19:05:06Z

shell/platform/darwin/ios/framework/Info.plist

@@ -21,10 +21,10 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
-  <string>8.0</string>


@jmagman I imagine it's ok but just double checking, both #28783 and #28743 touched this line. Neither of which are in the cherry-pick base. Cherry picking this directly is ok?

Is 4460688 in this branch? Otherwise this doesn't need to be cherry-picked. I can't tell what the parent SHA is from the GitHub UI.

Ah, it's branched off 5b81c6d (that makes sense). Just cherry pick #28783 then, it's more focused and lower risk. Thanks @xster!

Ah, you're saying #28783 addresses b/200635527 too? Done

Exactly, sorry I wasn't clear! 😄

christopherfujino

branch and source commits LGTM.

jmagman · 2021-09-29T22:39:56Z

The jcenter failures were fixed by #28777, which only touches test files, if you want to cp that too. Or you can keep re-running until it deflakes.

xster · 2021-09-30T04:56:03Z

Thanks for the tip Jenn!

fluttergithubbot · 2021-09-30T05:58:02Z

This pull request is not suitable for automatic merging in its current state.

The status or check suite Linux Web Framework tests has failed. Please fix the issues identified (or deflake) before re-applying this label.

jmagman

This is still cherry picking #28743 instead of the more focused #28783, but I think that should be fine.

jmagman

Still LGTM

jmagman · 2021-09-30T21:47:28Z

shell/platform/darwin/ios/framework/Info.plist

@@ -21,10 +21,10 @@
  <key>CFBundleVersion</key>
  <string>1.0</string>
  <key>MinimumOSVersion</key>
-  <string>8.0</string>


Exactly, sorry I wasn't clear! 😄

jmagman · 2021-09-30T22:02:18Z

The jcenter failures were fixed by #28777, which only touches test files, if you want to cp that too. Or you can keep re-running until it deflakes.

It's still failing, also may need #28738.

google-cla · 2021-09-30T23:30:39Z

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.

google-cla · 2021-09-30T23:31:36Z

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.

google-cla · 2021-09-30T23:31:55Z

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.

Fixes FlutterSemanticsScrollView to not implement accessibility conta…

a74a56d

…iner API (flutter#28846)

xster requested a review from christopherfujino September 29, 2021 18:43

flutter-dashboard bot added the platform-ios label Sep 29, 2021

flutter-dashboard bot added the needs tests label Sep 29, 2021

google-cla bot added the cla: yes label Sep 29, 2021

add branch to test

6acecc6

xster changed the title ~~Cherry-pick #28846 into flutter-2.6-candidate.11~~ Cherry-pick #28846 and #28743 into flutter-2.6-candidate.11 Sep 29, 2021

flutter-dashboard bot added the embedder Related to the embedder API label Sep 29, 2021

xster commented Sep 29, 2021

View reviewed changes

christopherfujino approved these changes Sep 29, 2021

View reviewed changes

flutter-dashboard bot added the platform-android label Sep 30, 2021

xster added the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label Sep 30, 2021

fluttergithubbot removed the waiting for tree to go green This PR is approved and tested, but waiting for the tree to be green to land. label Sep 30, 2021

jmagman approved these changes Sep 30, 2021

View reviewed changes

Emmanuel Garcia and others added 2 commits September 30, 2021 14:29

Replace jcenter() for mavenCentral() (flutter#28777)

29b700d

Set MinimumOSVersion to iOS 9 in Info.plist (flutter#28783)

705c2ad

xster force-pushed the flutter-2.6-candidate.11 branch from e65db1a to 705c2ad Compare September 30, 2021 21:29

jmagman approved these changes Sep 30, 2021

View reviewed changes

Do not use jcenter(), switch to mavenCentral() (flutter#28738)

9ea5d83

google-cla bot added cla: no and removed cla: yes labels Sep 30, 2021

xster added cla: yes and removed cla: no labels Sep 30, 2021

google-cla bot added cla: no cla: yes and removed cla: yes cla: no labels Sep 30, 2021

xster merged commit 8bd90a7 into flutter:flutter-2.6-candidate.11 Oct 4, 2021

xster deleted the flutter-2.6-candidate.11 branch October 4, 2021 20:52

Cherry-pick #28846 and #28743 into flutter-2.6-candidate.11 #28937

Cherry-pick #28846 and #28743 into flutter-2.6-candidate.11 #28937

Uh oh!

Conversation

xster commented Sep 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

flutter-dashboard bot commented Sep 29, 2021

Uh oh!

flutter-dashboard bot commented Sep 29, 2021

Uh oh!

xster Sep 29, 2021

Choose a reason for hiding this comment

Uh oh!

jmagman Sep 29, 2021

Choose a reason for hiding this comment

Uh oh!

jmagman Sep 29, 2021

Choose a reason for hiding this comment

Uh oh!

xster Sep 30, 2021

Choose a reason for hiding this comment

Uh oh!

jmagman Sep 30, 2021

Choose a reason for hiding this comment

Uh oh!

christopherfujino left a comment

Choose a reason for hiding this comment

Uh oh!

jmagman commented Sep 29, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

xster commented Sep 30, 2021

Uh oh!

fluttergithubbot commented Sep 30, 2021

Uh oh!

jmagman left a comment

Choose a reason for hiding this comment

Uh oh!

jmagman left a comment

Choose a reason for hiding this comment

Uh oh!

jmagman Sep 30, 2021

Choose a reason for hiding this comment

Uh oh!

jmagman commented Sep 30, 2021

Uh oh!

google-cla bot commented Sep 30, 2021

Uh oh!

google-cla bot commented Sep 30, 2021

Uh oh!

google-cla bot commented Sep 30, 2021

Uh oh!

Uh oh!

xster commented Sep 29, 2021 •

edited

Loading

jmagman commented Sep 29, 2021 •

edited

Loading