Skip to content

Parse .flutter-plugins-dependencies for add-to-app iOS modules, remove no-op plugin iOS folder - #62372

Merged
jmagman merged 2 commits into
flutter:flutter-1.20-candidate.7from
jmagman:a2a-deps-cp
Aug 4, 2020
Merged

Parse .flutter-plugins-dependencies for add-to-app iOS modules, remove no-op plugin iOS folder#62372
jmagman merged 2 commits into
flutter:flutter-1.20-candidate.7from
jmagman:a2a-deps-cp

Conversation

@jmagman

@jmagman jmagman commented Jul 28, 2020 •
edited
Loading

Copy link
Copy Markdown
Member

Description

1.20 cherry-pick of #61269 and #61561.

There was a merge conflict related to the integration test so I removed the rename cleanup, but it's testing the same thing. The podhelper Ruby code is identical to that PR

Fixes #60215.

@jmagman jmagman added platform-ios iOS applications specifically tool Affects the "flutter" command-line tool. See also t: labels. a: existing-apps Integration with existing apps via the add-to-app flow labels Jul 28, 2020
@fluttergithubbot

fluttergithubbot commented Jul 28, 2020

Copy link
Copy Markdown
Contributor

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 beta. 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.

@fluttergithubbot
fluttergithubbot changed the base branch from beta to master July 28, 2020 02:51
@fluttergithubbot fluttergithubbot added engine flutter/engine related. See also e: labels. framework flutter/packages/flutter repository. See also f: labels. c: contributor-productivity Team-specific productivity, code health, technical debt. labels Jul 28, 2020
@fluttergithubbot

fluttergithubbot commented Jul 28, 2020

Copy link
Copy Markdown
Contributor

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.

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

@jmagman
jmagman changed the base branch from master to beta July 28, 2020 02:52
@jmagman jmagman changed the title Parse .flutter-plugins-dependencies for add-to-app iOS modules Parse .flutter-plugins-dependencies for add-to-app iOS modules, remove no-op plugin iOS folder Jul 28, 2020
@jmagman jmagman mentioned this pull request Jul 28, 2020
Merged
9 of 13 tasks
christopherfujino
christopherfujino approved these changes Jul 28, 2020
View reviewed changes

@christopherfujino christopherfujino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@christopherfujino
christopherfujino self-requested a review July 28, 2020 20:51
christopherfujino
christopherfujino suggested changes Jul 28, 2020
View reviewed changes

@christopherfujino christopherfujino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

please change the merge target to branch flutter-1.20-candidate.7

@jmagman
jmagman changed the base branch from beta to flutter-1.20-candidate.7 July 28, 2020 20:57
@fluttergithubbot
fluttergithubbot changed the base branch from flutter-1.20-candidate.7 to master July 28, 2020 20:57
@fluttergithubbot

fluttergithubbot commented Jul 28, 2020

Copy link
Copy Markdown
Contributor

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.20-candidate.7. 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.

@jmagman
jmagman changed the base branch from master to flutter-1.20-candidate.7 July 28, 2020 20:58
@jmagman

jmagman commented Jul 28, 2020

Copy link
Copy Markdown
Member Author

please change the merge target to branch flutter-1.20-candidate.7

Done.

christopherfujino
christopherfujino approved these changes Jul 28, 2020
View reviewed changes

@christopherfujino christopherfujino left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM again

@jmagman jmagman mentioned this pull request Jul 29, 2020
Closed
@jmagman jmagman mentioned this pull request Jul 29, 2020
Closed
@jmagman
jmagman changed the base branch from flutter-1.20-candidate.7 to flutter-1.20-candidate.8 July 30, 2020 17:27
@fluttergithubbot

fluttergithubbot commented Jul 30, 2020

Copy link
Copy Markdown
Contributor

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.20-candidate.8. 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.

@fluttergithubbot
fluttergithubbot changed the base branch from flutter-1.20-candidate.8 to master July 30, 2020 17:27
@jmagman
jmagman changed the base branch from master to flutter-1.20-candidate.8 July 30, 2020 17:27
@jmagman
jmagman changed the base branch from flutter-1.20-candidate.8 to flutter-1.20-candidate.7 July 30, 2020 17:40
@cyanglaz

cyanglaz commented Jul 30, 2020

Copy link
Copy Markdown

We still need to bump the low SDK constraint to 1.20.0, should we do it in this PR?

@jmagman jmagman removed engine flutter/engine related. See also e: labels. framework flutter/packages/flutter repository. See also f: labels. labels Jul 31, 2020
@jmagman jmagman mentioned this pull request Jul 31, 2020
Merged
9 of 10 tasks
pcsosinski
pcsosinski approved these changes Aug 3, 2020
View reviewed changes

@pcsosinski pcsosinski left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

customer_testing-* failures are expected for the 1.20 branch (#57062)

@cyanglaz

cyanglaz commented Aug 4, 2020

Copy link
Copy Markdown

we need to include #62605 in this CP otherwise the newly created plugin will fail when publishing.

@pcsosinski

pcsosinski commented Aug 4, 2020

Copy link
Copy Markdown

does it need to go into master? or just added to this PR?

@jmagman
jmagman merged commit f904f51 into flutter:flutter-1.20-candidate.7 Aug 4, 2020
@jmagman
jmagman deleted the a2a-deps-cp branch August 4, 2020 16:15
This was referenced Aug 4, 2020
Closed
Closed
Merged
@jmagman jmagman mentioned this pull request Aug 12, 2020
Closed
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Aug 4, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@xster xster xster approved these changes
@cyanglaz cyanglaz Awaiting requested review from cyanglaz
+2 more reviewers
@christopherfujino christopherfujino christopherfujino approved these changes
@pcsosinski pcsosinski pcsosinski approved these changes
Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

a: existing-apps Integration with existing apps via the add-to-app flow c: contributor-productivity Team-specific productivity, code health, technical debt. platform-ios iOS applications specifically 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.

flutter create -t plugin should not create no-op iOS folders in 1.20.0 stable release

7 participants

@jmagman @fluttergithubbot @cyanglaz @pcsosinski @xster @christopherfujino @googlebot