Skip to content

Harden macOS build use of Xcode project getInfo#40375

Merged
stuartmorgan-g merged 2 commits intoflutter:masterfrom
stuartmorgan-g:macos-renamed-proj
Sep 12, 2019
Merged

Harden macOS build use of Xcode project getInfo#40375
stuartmorgan-g merged 2 commits intoflutter:masterfrom
stuartmorgan-g:macos-renamed-proj

Conversation

@stuartmorgan-g
Copy link
Contributor

@stuartmorgan-g stuartmorgan-g commented Sep 12, 2019

Description

  • Makes build_macos.dart handle the case where there is only one Xcode
    project in the macos/ directory, but it's not called Runner.xcodeproj
  • Makes getInfo throw a tool exit when trying to get project info and it
    can't find a project, since that is a configuration error by the user
    rather than a tool bug.

Related Issues

See discussion in #39782

Tests

I added the following tests:

  • Basic test of a successful XcodeProjectInterpreter.getInfo, which was previously untested
  • Test of XcodeProjectInterpreter.getInfo where xcodebuild returns a missing project error code.

Checklist

Before you create this PR confirm that it meets all requirements listed below by checking the relevant checkboxes ([x]). This will ensure a smooth and quick review process.

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I signed the CLA.
  • I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
  • I updated/added relevant documentation (doc comments with ///).
  • All existing and new tests are passing.
  • The analyzer (flutter analyze --flutter-repo) does not report any problems on my PR.
  • I am willing to follow-up on review comments in a timely manner.

Breaking Change

Does your PR require Flutter developers to manually update their apps to accommodate your change?

  • Yes, this is a breaking change (Please read Handling breaking changes). Replace this with a link to the e-mail where you asked for input on this proposed change.
  • No, this is not a breaking change.

@stuartmorgan-g
Harden macOS build use of Xcode project getInfo
4b6431f 
- Makes build_macos.dart handle the case where there is only one Xcode
  project in the macos/ directory, but it's not called Runner.xcodeproj
- Makes getInfo throw a tool exit when trying to get project info and it
  can't find a project, since that is a configuration error by the user
  rather than a tool bug.
@fluttergithubbot fluttergithubbot added the tool Affects the "flutter" command-line tool. See also t: labels. label Sep 12, 2019
@codecov
Copy link

codecov bot commented Sep 12, 2019 •
edited
Loading

Codecov Report

Merging #40375 into master will decrease coverage by 0.07%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master   #40375      +/-   ##
==========================================
- Coverage   58.44%   58.36%   -0.08%     
==========================================
  Files         192      192              
  Lines       18627    18630       +3     
==========================================
- Hits        10886    10873      -13     
- Misses       7741     7757      +16
Flag Coverage Δ
#flutter_tool 58.36% <100%> (-0.08%) ⬇️
Impacted Files Coverage Δ
packages/flutter_tools/lib/src/ios/xcodeproj.dart 88.13% <100%> (+2.5%) ⬆️
...kages/flutter_tools/lib/src/macos/build_macos.dart 92.3% <100%> (ø) ⬆️
packages/flutter_tools/lib/src/version.dart 44.54% <0%> (-48.35%) ⬇️
...ges/flutter_tools/lib/src/application_package.dart 50.74% <0%> (-14.82%) ⬇️
...ter_tools/lib/src/fuchsia/application_package.dart 62.96% <0%> (-11.12%) ⬇️
...ackages/flutter_tools/lib/src/commands/create.dart 67.43% <0%> (-5.27%) ⬇️
packages/flutter_tools/lib/src/device.dart 57.64% <0%> (-4.12%) ⬇️
packages/flutter_tools/lib/src/project.dart 81.9% <0%> (-1.91%) ⬇️
packages/flutter_tools/lib/src/context_runner.dart 70.37% <0%> (-1.86%) ⬇️
packages/flutter_tools/lib/src/android/gradle.dart 60.4% <0%> (-1.23%) ⬇️
... and 14 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 cd84cea...9c817a5. Read the comment docs.

zanderso
zanderso approved these changes Sep 12, 2019
View reviewed changes
@stuartmorgan-g stuartmorgan-g merged commit 72888c7 into flutter:master Sep 12, 2019
@stuartmorgan-g stuartmorgan-g deleted the macos-renamed-proj branch September 12, 2019 23:03
Inconnu08 pushed a commit to Inconnu08/flutter that referenced this pull request Sep 30, 2019
@stuartmorgan-g @Inconnu08
Harden macOS build use of Xcode project getInfo (flutter#40375)
1ab2beb 
- Makes build_macos.dart handle the case where there is only one Xcode
  project in the macos/ directory, but it's not called Runner.xcodeproj
- Makes getInfo throw a tool exit when trying to get project info and it
  can't find a project, since that is a configuration error by the user
  rather than a tool bug.
@jmagman jmagman mentioned this pull request May 13, 2021
Merged
@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

@zanderso zanderso zanderso approved these changes

Assignees

No one assigned

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.

4 participants

@stuartmorgan-g @zanderso @googlebot @fluttergithubbot