-
Notifications
You must be signed in to change notification settings - Fork 29.8k
Share common logic between UnpackMacOS and UnpackIOS build targets #168034
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.
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
Conversation
|
Golden file changes have been found for this pull request. Click here to view and triage (e.g. because this is an intentional change). If you are still iterating on this change and are not ready to resolve the images on the Flutter Gold dashboard, consider marking this PR as a draft pull request above. You will still be able to view image results on the dashboard, commenting will be silenced, and the check will not try to resolve itself until marked ready for review. For more guidance, visit Writing a golden file test for Reviewers: Read the Tree Hygiene page and make sure this patch meets those guidelines before LGTMing. |
packages/flutter_tools/lib/src/build_system/targets/darwin.dart
Outdated
Show resolved
Hide resolved
| } | ||
| } | ||
|
|
||
| /// Destructively thin Flutter.framework to include only the specified architectures. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The allowed values of the archs argument isn't immediately obvious from this method. Consider adding a comment here of an expected value, like "x86_64 arm64".
Alternatively, consider accepting a List<DarwinArch> instead.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since the string value comes from Xcode, I added a comment rather than parsing it into a list.
loic-sharma
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Very nice clean up!
| environment.outputDir.path, | ||
| ]); | ||
| if (result.exitCode != 0) { | ||
| throw Exception( |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I know this was a refactor, but a driveby note for another time: the exceptions that could be thrown during the reentrant xcode_backend calls should probably be a single line, be prefixed with "error: " to make them errors that show up in Xcode, and the text should be as actionable as possible to a Flutter dev.
…lutter#168034) `UnpackIOS` and `UnpackMacOS` have shared logic, which is currently basically duplicate code. We also plan to add more shared logic for SwiftPM. To simply that, this PR creates an abstract `UnpackDarwin` class with the shared logic. No functionality is changed other than slightly changed error logs for `UnpackMacOS`. Code is tested by: - https://github.com/flutter/flutter/blob/master/packages/flutter_tools/test/general.shard/build_system/targets/ios_test.dart - https://github.com/flutter/flutter/blob/master/packages/flutter_tools/test/general.shard/build_system/targets/macos_test.dart Fixes flutter#168029. ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
UnpackIOSandUnpackMacOShave shared logic, which is currently basically duplicate code. We also plan to add more shared logic for SwiftPM. To simplify that, this PR creates an abstractUnpackDarwinclass with the shared logic.No functionality is changed other than slightly changed error logs for
UnpackMacOS. Code is tested by:Fixes #168029.
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.