Fix macOS relative plugin Xcode file path#183593
Merged
auto-submit[bot] merged 1 commit intoflutter:masterfrom Mar 12, 2026
Merged
Fix macOS relative plugin Xcode file path#183593auto-submit[bot] merged 1 commit intoflutter:masterfrom
auto-submit[bot] merged 1 commit intoflutter:masterfrom
Conversation
github-actions
bot
added
the
tool
![gemini-code-assist[bot]](proxy.php?url=https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Code Review
This pull request modifies the Swift Package Manager integration migration to correctly calculate relative plugin paths for macOS. It introduces platform-specific logic to use a different base directory for path calculation on macOS versus iOS. The corresponding tests are updated to reflect this change, including adding a managedDirectory property to the fake Xcode project for testing purposes.
| "sourceTree": "<group>" | ||
| }'''; | ||
| if (includePlugin) { | ||
| final pluginLeadingPath = platform == FlutterDarwinPlatform.ios ? '../../' : '../../../'; |
Contributor
There was a problem hiding this comment.
The logic for determining pluginLeadingPath is also present on line 3595. To adhere to the style guide principle of avoiding duplication, consider extracting this logic into a private top-level helper function. For example:
String _getPluginLeadingPath(FlutterDarwinPlatform platform) {
return platform == FlutterDarwinPlatform.ios ? '../../' : '../../../';
}You could then call this function here and on line 3595.
References
- The style guide recommends avoiding duplication of state or logic to maintain a single source of truth. This logic for determining the plugin path is duplicated in two places within this test file. (link)
stuartmorgan-g
approved these changes
Mar 12, 2026
Contributor
stuartmorgan-g
left a comment
stuartmorgan-g
left a comment
There was a problem hiding this comment.
LGTM
I'm curious why the group on iOS doesn't use its path, but I guess at this point trying to change it would be a nightmare.
Contributor
Author
I think it's because iOS uses and macOS uses |
Contributor
|
Right, I'm just curious why |
vashworth
added
the
autosubmit
Contributor
Author
Oh yeah that I'm not sure about |
flutter-dashboard
bot
removed
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Mar 13, 2026
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Mar 13, 2026
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Mar 13, 2026
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Mar 14, 2026
auto-submit bot
pushed a commit
to flutter/packages
that referenced
this pull request
Mar 14, 2026
flutter/flutter@9e36adb...732e05d 2026-03-13 [email protected] Roll Dart SDK from 330b797abd09 to d5f6d3c17499 (1 revision) (flutter/flutter#183640) 2026-03-13 [email protected] Roll Skia from 9eb5598e1b2c to 029229d8be91 (3 revisions) (flutter/flutter#183638) 2026-03-13 [email protected] Roll Skia from 9be8fdf31ff4 to 9eb5598e1b2c (2 revisions) (flutter/flutter#183630) 2026-03-13 [email protected] Add awaits to flutter/test callsites (flutter/flutter#183487) 2026-03-13 [email protected] Add await to more flutter/flutter callsites (flutter/flutter#183413) 2026-03-13 [email protected] Roll Dart SDK from d1d84ab7ef0d to 330b797abd09 (2 revisions) (flutter/flutter#183624) 2026-03-13 [email protected] refactor: remove material import from sliver_resizing_header_test and sliver_prototype_item_extent_test (flutter/flutter#183562) 2026-03-13 [email protected] Fix reselection issue after the text is cleared (flutter/flutter#183545) 2026-03-13 [email protected] Roll Skia from 255bd243276b to 9be8fdf31ff4 (5 revisions) (flutter/flutter#183616) 2026-03-12 [email protected] ci: Remove `bringup` from orchestrator for windows_arm_host_engine on Linux (flutter/flutter#183574) 2026-03-12 [email protected] Use operator<=> instead of std::less for UniqueID. (flutter/flutter#183600) 2026-03-12 [email protected] Specified the repo the cp label will be removed from (flutter/flutter#183611) 2026-03-12 [email protected] [web] Fix Web SDK build on macOS (flutter/flutter#183549) 2026-03-12 [email protected] Roll Skia from 38761e1803d0 to 255bd243276b (3 revisions) (flutter/flutter#183603) 2026-03-12 [email protected] Roll Dart SDK from 2e1e7a09fce6 to d1d84ab7ef0d (1 revision) (flutter/flutter#183604) 2026-03-12 [email protected] Fix macOS relative plugin Xcode file path (flutter/flutter#183593) 2026-03-12 [email protected] Made cp labels get rejected on issues. (flutter/flutter#183595) 2026-03-12 [email protected] Roll Packages from ecace66 to 02f231f (4 revisions) (flutter/flutter#183594) 2026-03-12 [email protected] Roll Dart SDK from 59be21f25f2d to 2e1e7a09fce6 (1 revision) (flutter/flutter#183577) 2026-03-12 [email protected] Roll Skia from 46f41493ebf4 to 38761e1803d0 (6 revisions) (flutter/flutter#183590) If this roll has caused a breakage, revert this CL and stop the roller using the controls here: https://autoroll.skia.org/r/flutter-packages Please CC [email protected] on the revert to ensure that a human is aware of the problem. To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose To report a problem with the AutoRoller itself, please file a bug: https://issues.skia.org/issues/new?component=1389291&template=1850622 Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #183591.
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.
Note: The Flutter team is currently trialing the use of Gemini Code Assist for GitHub. Comments from the
gemini-code-assistbot should not be taken as authoritative feedback from the Flutter team. If you find its comments useful you can update your code accordingly, but if you are unsure or disagree with the feedback, please feel free to wait for a Flutter team member's review for guidance on which automated comments should be addressed.