Skip to content

V1.9.1 hotfixes #42863

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
zanderso merged 1 commit into from
Oct 17, 2019
Merged

V1.9.1 hotfixes #42863

zanderso merged 1 commit into from
Oct 17, 2019

Conversation

@zanderso
Copy link
Member

@zanderso zanderso commented Oct 16, 2019 •
edited
Loading

This hotfix addresses the issue described in #41253. In particular it is needed to fix the tool's use of Cocoapods >= 1.8.0.

@jmagman @zanderso
V1.9.1 hotfixes
c4d5131 
* refactor cocoapods validator to detect broken install (#38560)
* Skip pod initialization if version >= 1.8.0. (#41491)
@zanderso zanderso requested a review from jmagman as a code owner October 16, 2019 19:19
@fluttergithubbot
Copy link
Contributor

fluttergithubbot commented Oct 16, 2019

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 v1.9.1-hotfixes. See the Release Process for information about how other branches get updated.

Reviewers: Use caution before merging pull requests to branches other than master. The circumstances where this is valid are very rare.

/cc @dnfield

@fluttergithubbot fluttergithubbot changed the base branch from v1.9.1-hotfixes to master October 16, 2019 19:19
@fluttergithubbot fluttergithubbot added engine flutter/engine related. See also e: labels. c: contributor-productivity Team-specific productivity, code health, technical debt. tool Affects the "flutter" command-line tool. See also t: labels. labels Oct 16, 2019
@zanderso zanderso changed the base branch from master to v1.9.1-hotfixes October 16, 2019 19:20
jmagman
jmagman approved these changes Oct 16, 2019
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.

Checked this out locally, I confirmed it's working as expected.
Before this change with CocoaPods 1.8.3:

[!] Xcode - develop for iOS and macOS (Xcode 11.2)
    • Xcode at /Users/magder/Applications/Xcode-11_2.app/Contents/Developer
    • Xcode 11.2, Build version 11B41
    ✗ CocoaPods installed but not initialized.
        CocoaPods is used to retrieve the iOS and macOS platform side's plugin code that responds to your plugin usage on the Dart side.
        Without CocoaPods, plugins will not work on iOS or macOS.
        For more info, see https://flutter.dev/platform-plugins
      To initialize CocoaPods, run:
        pod setup
      once to finalize CocoaPods' installation.

after:

[✓] Xcode - develop for iOS and macOS (Xcode 11.2)
    • Xcode at /Users/magder/Applications/Xcode-11_2.app/Contents/Developer
    • Xcode 11.2, Build version 11B41
    • CocoaPods version 1.8.3

and flutter build ios calls pod install correctly.

@codecov
Copy link

codecov bot commented Oct 16, 2019 •
edited
Loading

Codecov Report

Merging #42863 into v1.9.1-hotfixes will increase coverage by 0.76%.
The diff coverage is 66.66%.

Impacted file tree graph

@@                 Coverage Diff                 @@
##           v1.9.1-hotfixes   #42863      +/-   ##
===================================================
+ Coverage            54.25%   55.01%   +0.76%     
===================================================
  Files                  196      196              
  Lines                18280    18291      +11     
===================================================
+ Hits                  9917    10063     +146     
+ Misses                8363     8228     -135
Flag Coverage Δ
#flutter_tool 55.01% <66.66%> (+0.76%) ⬆️
Impacted Files Coverage Δ
...ages/flutter_tools/lib/src/base/user_messages.dart 49.05% <0%> (+0.48%) ⬆️
...utter_tools/lib/src/macos/cocoapods_validator.dart 81.81% <33.33%> (-7.66%) ⬇️
...ackages/flutter_tools/lib/src/macos/cocoapods.dart 86.23% <87.5%> (+44.49%) ⬆️
packages/flutter_tools/lib/src/ios/xcodeproj.dart 40.13% <0%> (-43.43%) ⬇️
packages/flutter_tools/lib/src/device.dart 32.53% <0%> (-24.7%) ⬇️
...ckages/flutter_tools/lib/src/reporting/events.dart 78.57% <0%> (-19.65%) ⬇️
...ackages/flutter_tools/lib/src/commands/daemon.dart 17.67% <0%> (-16.52%) ⬇️
packages/flutter_tools/lib/src/ios/mac.dart 14.37% <0%> (-13.73%) ⬇️
packages/flutter_tools/lib/src/version.dart 90.73% <0%> (-1.47%) ⬇️
packages/flutter_tools/lib/src/artifacts.dart 67.37% <0%> (-0.36%) ⬇️
... and 21 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cc949a8...c4d5131. Read the comment docs.

@jmagman
Copy link
Member

jmagman commented Oct 16, 2019

add2app-macos is failing due to #40174, which we decided not to hotfix because it only impacts add-to-app, which is only supported on master since it's experimental.

It also failed in hotfix.4 https://github.com/flutter/flutter/pull/41504/checks?check_run_id=239269814 so was not caused by anything in this PR.

@zanderso zanderso requested a review from tvolkert October 16, 2019 22:05
tvolkert
tvolkert approved these changes Oct 17, 2019
View reviewed changes
Copy link
Contributor

@tvolkert tvolkert left a comment

Choose a reason for hiding this comment

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

Ok to submit on red (including Flutter build, since this doesn't merge to master).

@zanderso zanderso merged commit 1aedbb1 into flutter:v1.9.1-hotfixes Oct 17, 2019
@zanderso zanderso deleted the jenn-hotfix branch October 17, 2019 15:37
@goderbauer goderbauer mentioned this pull request Oct 23, 2019
Merged
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Aug 3, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

@jmagman jmagman jmagman approved these changes

+1 more reviewer

@tvolkert tvolkert tvolkert approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

c: contributor-productivity Team-specific productivity, code health, technical debt. engine flutter/engine related. See also e: 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.

5 participants

@zanderso @fluttergithubbot @jmagman @tvolkert @googlebot