Add FlutterFramework as an Xcode SwiftPM local package override by vashworth · Pull Request #179512 · flutter/flutter

vashworth · 2025-12-05T19:31:41Z

This PR adds the FlutterFramework as an Xcode local package override by adding it as a "file" to the Xcode project. In addition, it also adds the plugin as a local package override if we detect the app is a plugin's example app.

Fixes #179032. Fixes #172427.

Pre-launch Checklist

I read the Contributor Guide and followed the process outlined there for submitting PRs.
I read the Tree Hygiene wiki page, which explains my responsibilities.
I read and followed the Flutter Style Guide, including Features we expect every widget to implement.
I signed the CLA.
I listed at least one issue that this PR fixes in the description above.
I updated/added relevant documentation (doc comments with ///).
I added new tests to check the change I am making, or this PR is test-exempt.
I followed the breaking change policy and added Data Driven Fixes where supported.
All existing and new tests are passing.

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-assist bot 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.

The main purpose of this PR is to add the Flutter framework as a Swift Package dependency. As such, Xcode will now handle the copying, thinning, and codesigning of the framework and therefore the Flutter Xcode Run Scripts shouldn't. This will allow plugins to declare a dependency on the Flutter framework package and eliminate the need for the Pre-Action "prepare" script. This PR does not technically make the Flutter framework a local package override, that will be added in a follow up PR: #179512 This change includes: * Generation of the FlutterFramework swift package (this will generate a Package.swift and symlink to the Flutter framework in the artifact cache) <img width="400" height="271" alt="Screenshot 2025-12-04 at 4 54 43 PM" src="https://github.com/user-attachments/assets/6cfde6da-3698-4b76-b3b1-725f91fbf58d" /> * Adding the FlutterFramework as a dependency to the FlutterGeneratedPluginSwiftPackage (which the the Swift package the Xcode project has a dependency on) <img width="400" height="195" alt="Screenshot 2025-12-04 at 4 55 13 PM" src="https://github.com/user-attachments/assets/30fa402a-6a11-4df0-b2cd-a4a82197e50a" /> ### Change to Flutter Run Scripts Flutter currently has 3 Xcode Run Scripts: * prepare (happens in a scheme pre-action) * [PREVIOUS] Via `flutter assemble` - copies the Flutter framework from engine build cache to `BUILT_PRODUCTS_DIR` * [NEW] Same as previous except skips codesigning. This is still included to accommodate plugins that don't have a dependency declared on the Flutter framework. * build (happens in first Run Script in the Xcode build phases that happens before compiling) * [PREVIOUS] Via `flutter assemble` - copies, thins, and codesigns Flutter framework into `BUILT_PRODUCTS_DIR` * [NEW] Is skipped, Xcode now does this * embed_and_thin (happens in second Run Script in the Xcode build phases after compiling, linking, and embedding) * [PREVIOUS] Copies Flutter framework from `BUILT_PRODUCTS_DIR` to `TARGET_BUILD_DIR` * [NEW] * Validates Flutter framework in `BUILT_PRODUCTS_DIR` & `TARGET_BUILD_DIR` (which would have been put there by Xcode via SwiftPM) matches the Flutter framework in the engine cache. * If it matches, do not copy. Xcode now does this. * If it doesn't: * Call `flutter assemble` to copy the correct Flutter framework into `BUILT_PRODUCTS_DIR` * Then copy from `BUILT_PRODUCTS_DIR` to `TARGET_BUILD_DIR`. Fixes #166489. ## 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]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot 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.  [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

…age_overrides

gemini-code-assist

Code Review

This pull request introduces significant enhancements to Swift Package Manager integration within Flutter projects. It adds support for including FlutterFramework as an Xcode local package override and extends this functionality to include plugin overrides for example applications. The changes are well-implemented across the SwiftPackageManagerIntegrationMigration class, Xcode project templates for both iOS and macOS, and are thoroughly covered by new and updated test cases. The code demonstrates a clear understanding of Xcode project structures and Swift Package Manager mechanics, ensuring robust and correct migration behavior.

stuartmorgan-g

LGTM

stuartmorgan-g · 2026-01-14T18:52:03Z

  final List<String>? packageReferences;
 }
+
+class _PluginRelativeToExample {


Optional: you could just used a record with named fields, instead of defining a type just to return two things.

Oooh cool, I didn't know you could do named fields. Done!

stuartmorgan-g · 2026-01-14T18:58:46Z

+  }) {
+    try {
+      final FlutterProject flutterProject = xcodeProject.parent;
+      if (flutterProject.directory.path.endsWith('example') &&


This won't catch everything; it wouldn't work for the current google_maps_flutter_ios examples, for instance. I would expect that's rare enough that it's not a significant issue, but we should consider whether we can document somewhere—maybe even just as a comment in the issue this fixes—how unusual examples could be fixed manually.

We could try to make this more comprehensive by walking up several levels looking for an example directory that is in a directory with a pubspec), but I think it's probably not worth the added complexity.

Right, this makes like a best effort. I plan to also add website docs: flutter/website#12936

stuartmorgan-g · 2026-01-14T19:02:02Z

 		{{#withSwiftPackageManager}}
 		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
+		784666492D4C4C64000A1A5F /* FlutterFramework */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterFramework; path = Flutter/ephemeral/Packages/.packages/FlutterFramework; sourceTree = "<group>"; };
+		{{#withPlatformChannelPluginHook}}


Oops, I forgot this is the condition name we used for plugins with a plugin-style build. We'll need to rename it at some point (not directly related to this PR, mostly noting as a reminder to myself).

The main purpose of this PR is to add the Flutter framework as a Swift Package dependency. As such, Xcode will now handle the copying, thinning, and codesigning of the framework and therefore the Flutter Xcode Run Scripts shouldn't. This will allow plugins to declare a dependency on the Flutter framework package and eliminate the need for the Pre-Action "prepare" script. This PR does not technically make the Flutter framework a local package override, that will be added in a follow up PR: flutter#179512 This change includes: * Generation of the FlutterFramework swift package (this will generate a Package.swift and symlink to the Flutter framework in the artifact cache) <img width="400" height="271" alt="Screenshot 2025-12-04 at 4 54 43 PM" src="https://github.com/user-attachments/assets/6cfde6da-3698-4b76-b3b1-725f91fbf58d" /> * Adding the FlutterFramework as a dependency to the FlutterGeneratedPluginSwiftPackage (which the the Swift package the Xcode project has a dependency on) <img width="400" height="195" alt="Screenshot 2025-12-04 at 4 55 13 PM" src="https://github.com/user-attachments/assets/30fa402a-6a11-4df0-b2cd-a4a82197e50a" /> ### Change to Flutter Run Scripts Flutter currently has 3 Xcode Run Scripts: * prepare (happens in a scheme pre-action) * [PREVIOUS] Via `flutter assemble` - copies the Flutter framework from engine build cache to `BUILT_PRODUCTS_DIR` * [NEW] Same as previous except skips codesigning. This is still included to accommodate plugins that don't have a dependency declared on the Flutter framework. * build (happens in first Run Script in the Xcode build phases that happens before compiling) * [PREVIOUS] Via `flutter assemble` - copies, thins, and codesigns Flutter framework into `BUILT_PRODUCTS_DIR` * [NEW] Is skipped, Xcode now does this * embed_and_thin (happens in second Run Script in the Xcode build phases after compiling, linking, and embedding) * [PREVIOUS] Copies Flutter framework from `BUILT_PRODUCTS_DIR` to `TARGET_BUILD_DIR` * [NEW] * Validates Flutter framework in `BUILT_PRODUCTS_DIR` & `TARGET_BUILD_DIR` (which would have been put there by Xcode via SwiftPM) matches the Flutter framework in the engine cache. * If it matches, do not copy. Xcode now does this. * If it doesn't: * Call `flutter assemble` to copy the correct Flutter framework into `BUILT_PRODUCTS_DIR` * Then copy from `BUILT_PRODUCTS_DIR` to `TARGET_BUILD_DIR`. Fixes flutter#166489. ## 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]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot 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.  [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

auto-submit · 2026-01-21T15:52:34Z

autosubmit label was removed for flutter/flutter/179512, because The base commit of the PR is older than 7 days and can not be merged. Please merge the latest changes from the main into this branch and resubmit the PR.

…ride (flutter/flutter#179512)

Roll Flutter from 48c2475 to bfc9041eb118 (173 revisions) flutter/flutter@48c2475...bfc9041 2026-01-23 [email protected] No longer exiting the application when the RegularWindow is destroyed + resolving the window created promise after runWidget (flutter/flutter#181339) 2026-01-23 [email protected] Remove unnecessary Material import from dialog_test.dart (flutter/flutter#181249) 2026-01-23 [email protected] Roll Skia from 8e516fe6828f to db10db8bd55f (1 revision) (flutter/flutter#181379) 2026-01-23 [email protected] Reset TextFormField to initial value after state change (flutter/flutter#181199) 2026-01-23 [email protected] Roll Dart SDK from 980b2b41d36e to e82d7ad1855e (1 revision) (flutter/flutter#181375) 2026-01-23 [email protected] Roll Skia from 3e86f377d300 to 8e516fe6828f (4 revisions) (flutter/flutter#181370) 2026-01-23 [email protected] Remove unnecessary Material import from sliver_visibility_test (flutter/flutter#181248) 2026-01-23 [email protected] Add bottom navigation bar item semantics label (flutter/flutter#180577) 2026-01-23 [email protected] Make topGap not required for CupertinoSheetTransition (flutter/flutter#181269) 2026-01-23 [email protected] Roll Fuchsia Linux SDK from b4cLyhuxciUC-4zCJ... to n7NohL9DPpEuPjNt9... (flutter/flutter#181365) 2026-01-23 [email protected] Roll Dart SDK from 806f04638561 to 980b2b41d36e (1 revision) (flutter/flutter#181364) 2026-01-23 [email protected] Reland hybrid views test (flutter/flutter#181336) 2026-01-23 [email protected] Revert DropdownMenu non-nullable breaking change (flutter/flutter#181074) 2026-01-23 [email protected] Fix leaks in `flutter_test` tests (flutter/flutter#180879) 2026-01-23 [email protected] Re-enable fragment_shader_tests.dart 'Shader Compiler appropriately pads vec3 uniform arrays' test on Vulkan (flutter/flutter#181292) 2026-01-23 [email protected] [ Tool ] Fix `update-packages` failing due to mismatched dependencies between flutter_tools and the framework (flutter/flutter#181335) 2026-01-23 [email protected] [Impeller] Make dynamically created shader metadata for runtime effects consistent with metadata for built-in shaders (flutter/flutter#181201) 2026-01-23 [email protected] Broaden the applicability of `Color` fix_data rules from flutter/painting.dart (flutter/flutter#181093) 2026-01-23 [email protected] Fixes macOS App.framework not being codesigned or find framework (flutter/flutter#181348) 2026-01-22 [email protected] Roll Fuchsia GN SDK from NAEC5tfgSl8g94nwp... to JLBh4Z9PKsjIJcqDU... (flutter/flutter#181139) 2026-01-22 [email protected] Roll Dart SDK from ab4640ea82e9 to 806f04638561 (2 revisions) (flutter/flutter#181347) 2026-01-22 [email protected] Add ExpansibleController.toggle method. (flutter/flutter#181320) 2026-01-22 [email protected] Fixes Typo in codebase (flutter/flutter#181256) 2026-01-22 [email protected] Roll Skia from 4766615bcc96 to 3e86f377d300 (3 revisions) (flutter/flutter#181346) 2026-01-22 [email protected] Make sure that a Hero doesn't crash in 0x0 environment (flutter/flutter#180954) 2026-01-22 [email protected] Reland "Fix capitalization of the path to FlutterWindowControllerTest.mm in the macOS platform build script" (flutter/flutter#181200) 2026-01-22 [email protected] Roll Skia from 6e9746be8c4a to 4766615bcc96 (3 revisions) (flutter/flutter#181331) 2026-01-22 [email protected] Fix remove material import textfield (flutter/flutter#181254) 2026-01-22 [email protected] Add FlutterFramework as an Xcode SwiftPM local package override (flutter/flutter#179512) 2026-01-22 [email protected] Roll Dart SDK from 7bd4c68b625c to ab4640ea82e9 (1 revision) (flutter/flutter#181324) 2026-01-22 [email protected] Roll Packages from d80c60e to 9010299 (9 revisions) (flutter/flutter#181323) 2026-01-22 [email protected] Roll Dart SDK from 2d53a77adc5d to 7bd4c68b625c (2 revisions) (flutter/flutter#181316) 2026-01-22 [email protected] Roll Skia from 3f6949bc5780 to 6e9746be8c4a (2 revisions) (flutter/flutter#181311) 2026-01-22 [email protected] Roll Skia from ef6efc358b4a to 3f6949bc5780 (2 revisions) (flutter/flutter#181307) 2026-01-22 [email protected] Roll Dart SDK from 5d7c8faf2e41 to 2d53a77adc5d (1 revision) (flutter/flutter#181305) 2026-01-22 [email protected] [Material] update hourFormat to use Dart 3 switch expression (flutter/flutter#181041) 2026-01-22 [email protected] Use null-aware elements in cupertino/nav_bar.dart (flutter/flutter#181237) 2026-01-22 [email protected] Roll Fuchsia Linux SDK from b2KIEXVAlEqImQ9VO... to b4cLyhuxciUC-4zCJ... (flutter/flutter#181297) 2026-01-22 [email protected] Roll pub packages (flutter/flutter#181295) 2026-01-22 [email protected] Enables fragment shader test for impeller (fixes mat2 on vulkan) (flutter/flutter#181013) 2026-01-21 [email protected] Roll Dart SDK from 366200db1aa1 to 5d7c8faf2e41 (4 revisions) (flutter/flutter#181290) 2026-01-21 [email protected] Roll Skia from b5ec89e31f59 to ef6efc358b4a (19 revisions) (flutter/flutter#181289) 2026-01-21 [email protected] fix description for semantics finders (flutter/flutter#181214) 2026-01-21 [email protected] Make sure that an Icon doesn't crash in 0x0 environment (flutter/flutter#181021) 2026-01-21 [email protected] Make sure that a GridPaper doesn't crash in 0x0 environment (flutter/flutter#180906) 2026-01-21 [email protected] Bring Linux coverage out of bringup (flutter/flutter#181280) ...

…ter#179512) This PR adds the FlutterFramework as an Xcode local package override by adding it as a "file" to the Xcode project. In addition, it also adds the plugin as a local package override if we detect the app is a plugin's example app. <img width="265" height="144" alt="Screenshot 2025-12-04 at 10 29 16 PM" src="https://github.com/user-attachments/assets/b822aa3c-14bd-4444-9e44-4e781a5ac11e" /> Fixes flutter#179032. Fixes flutter#172427. ## 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]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot 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.  [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

) Roll Flutter from 48c2475 to bfc9041eb118 (173 revisions) flutter/flutter@48c2475...bfc9041 2026-01-23 [email protected] No longer exiting the application when the RegularWindow is destroyed + resolving the window created promise after runWidget (flutter/flutter#181339) 2026-01-23 [email protected] Remove unnecessary Material import from dialog_test.dart (flutter/flutter#181249) 2026-01-23 [email protected] Roll Skia from 8e516fe6828f to db10db8bd55f (1 revision) (flutter/flutter#181379) 2026-01-23 [email protected] Reset TextFormField to initial value after state change (flutter/flutter#181199) 2026-01-23 [email protected] Roll Dart SDK from 980b2b41d36e to e82d7ad1855e (1 revision) (flutter/flutter#181375) 2026-01-23 [email protected] Roll Skia from 3e86f377d300 to 8e516fe6828f (4 revisions) (flutter/flutter#181370) 2026-01-23 [email protected] Remove unnecessary Material import from sliver_visibility_test (flutter/flutter#181248) 2026-01-23 [email protected] Add bottom navigation bar item semantics label (flutter/flutter#180577) 2026-01-23 [email protected] Make topGap not required for CupertinoSheetTransition (flutter/flutter#181269) 2026-01-23 [email protected] Roll Fuchsia Linux SDK from b4cLyhuxciUC-4zCJ... to n7NohL9DPpEuPjNt9... (flutter/flutter#181365) 2026-01-23 [email protected] Roll Dart SDK from 806f04638561 to 980b2b41d36e (1 revision) (flutter/flutter#181364) 2026-01-23 [email protected] Reland hybrid views test (flutter/flutter#181336) 2026-01-23 [email protected] Revert DropdownMenu non-nullable breaking change (flutter/flutter#181074) 2026-01-23 [email protected] Fix leaks in `flutter_test` tests (flutter/flutter#180879) 2026-01-23 [email protected] Re-enable fragment_shader_tests.dart 'Shader Compiler appropriately pads vec3 uniform arrays' test on Vulkan (flutter/flutter#181292) 2026-01-23 [email protected] [ Tool ] Fix `update-packages` failing due to mismatched dependencies between flutter_tools and the framework (flutter/flutter#181335) 2026-01-23 [email protected] [Impeller] Make dynamically created shader metadata for runtime effects consistent with metadata for built-in shaders (flutter/flutter#181201) 2026-01-23 [email protected] Broaden the applicability of `Color` fix_data rules from flutter/painting.dart (flutter/flutter#181093) 2026-01-23 [email protected] Fixes macOS App.framework not being codesigned or find framework (flutter/flutter#181348) 2026-01-22 [email protected] Roll Fuchsia GN SDK from NAEC5tfgSl8g94nwp... to JLBh4Z9PKsjIJcqDU... (flutter/flutter#181139) 2026-01-22 [email protected] Roll Dart SDK from ab4640ea82e9 to 806f04638561 (2 revisions) (flutter/flutter#181347) 2026-01-22 [email protected] Add ExpansibleController.toggle method. (flutter/flutter#181320) 2026-01-22 [email protected] Fixes Typo in codebase (flutter/flutter#181256) 2026-01-22 [email protected] Roll Skia from 4766615bcc96 to 3e86f377d300 (3 revisions) (flutter/flutter#181346) 2026-01-22 [email protected] Make sure that a Hero doesn't crash in 0x0 environment (flutter/flutter#180954) 2026-01-22 [email protected] Reland "Fix capitalization of the path to FlutterWindowControllerTest.mm in the macOS platform build script" (flutter/flutter#181200) 2026-01-22 [email protected] Roll Skia from 6e9746be8c4a to 4766615bcc96 (3 revisions) (flutter/flutter#181331) 2026-01-22 [email protected] Fix remove material import textfield (flutter/flutter#181254) 2026-01-22 [email protected] Add FlutterFramework as an Xcode SwiftPM local package override (flutter/flutter#179512) 2026-01-22 [email protected] Roll Dart SDK from 7bd4c68b625c to ab4640ea82e9 (1 revision) (flutter/flutter#181324) 2026-01-22 [email protected] Roll Packages from d80c60e to 9010299 (9 revisions) (flutter/flutter#181323) 2026-01-22 [email protected] Roll Dart SDK from 2d53a77adc5d to 7bd4c68b625c (2 revisions) (flutter/flutter#181316) 2026-01-22 [email protected] Roll Skia from 3f6949bc5780 to 6e9746be8c4a (2 revisions) (flutter/flutter#181311) 2026-01-22 [email protected] Roll Skia from ef6efc358b4a to 3f6949bc5780 (2 revisions) (flutter/flutter#181307) 2026-01-22 [email protected] Roll Dart SDK from 5d7c8faf2e41 to 2d53a77adc5d (1 revision) (flutter/flutter#181305) 2026-01-22 [email protected] [Material] update hourFormat to use Dart 3 switch expression (flutter/flutter#181041) 2026-01-22 [email protected] Use null-aware elements in cupertino/nav_bar.dart (flutter/flutter#181237) 2026-01-22 [email protected] Roll Fuchsia Linux SDK from b2KIEXVAlEqImQ9VO... to b4cLyhuxciUC-4zCJ... (flutter/flutter#181297) 2026-01-22 [email protected] Roll pub packages (flutter/flutter#181295) 2026-01-22 [email protected] Enables fragment shader test for impeller (fixes mat2 on vulkan) (flutter/flutter#181013) 2026-01-21 [email protected] Roll Dart SDK from 366200db1aa1 to 5d7c8faf2e41 (4 revisions) (flutter/flutter#181290) 2026-01-21 [email protected] Roll Skia from b5ec89e31f59 to ef6efc358b4a (19 revisions) (flutter/flutter#181289) 2026-01-21 [email protected] fix description for semantics finders (flutter/flutter#181214) 2026-01-21 [email protected] Make sure that an Icon doesn't crash in 0x0 environment (flutter/flutter#181021) 2026-01-21 [email protected] Make sure that a GridPaper doesn't crash in 0x0 environment (flutter/flutter#180906) 2026-01-21 [email protected] Bring Linux coverage out of bringup (flutter/flutter#181280) ...

The main purpose of this PR is to add the Flutter framework as a Swift Package dependency. As such, Xcode will now handle the copying, thinning, and codesigning of the framework and therefore the Flutter Xcode Run Scripts shouldn't. This will allow plugins to declare a dependency on the Flutter framework package and eliminate the need for the Pre-Action "prepare" script. This PR does not technically make the Flutter framework a local package override, that will be added in a follow up PR: flutter/flutter#179512 This change includes: * Generation of the FlutterFramework swift package (this will generate a Package.swift and symlink to the Flutter framework in the artifact cache) <img width="400" height="271" alt="Screenshot 2025-12-04 at 4 54 43 PM" src="https://github.com/user-attachments/assets/6cfde6da-3698-4b76-b3b1-725f91fbf58d" /> * Adding the FlutterFramework as a dependency to the FlutterGeneratedPluginSwiftPackage (which the the Swift package the Xcode project has a dependency on) <img width="400" height="195" alt="Screenshot 2025-12-04 at 4 55 13 PM" src="https://github.com/user-attachments/assets/30fa402a-6a11-4df0-b2cd-a4a82197e50a" /> ### Change to Flutter Run Scripts Flutter currently has 3 Xcode Run Scripts: * prepare (happens in a scheme pre-action) * [PREVIOUS] Via `flutter assemble` - copies the Flutter framework from engine build cache to `BUILT_PRODUCTS_DIR` * [NEW] Same as previous except skips codesigning. This is still included to accommodate plugins that don't have a dependency declared on the Flutter framework. * build (happens in first Run Script in the Xcode build phases that happens before compiling) * [PREVIOUS] Via `flutter assemble` - copies, thins, and codesigns Flutter framework into `BUILT_PRODUCTS_DIR` * [NEW] Is skipped, Xcode now does this * embed_and_thin (happens in second Run Script in the Xcode build phases after compiling, linking, and embedding) * [PREVIOUS] Copies Flutter framework from `BUILT_PRODUCTS_DIR` to `TARGET_BUILD_DIR` * [NEW] * Validates Flutter framework in `BUILT_PRODUCTS_DIR` & `TARGET_BUILD_DIR` (which would have been put there by Xcode via SwiftPM) matches the Flutter framework in the engine cache. * If it matches, do not copy. Xcode now does this. * If it doesn't: * Call `flutter assemble` to copy the correct Flutter framework into `BUILT_PRODUCTS_DIR` * Then copy from `BUILT_PRODUCTS_DIR` to `TARGET_BUILD_DIR`. Fixes flutter/flutter#166489. ## 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]. **Note**: The Flutter team is currently trialing the use of [Gemini Code Assist for GitHub](https://developers.google.com/gemini-code-assist/docs/review-github-code). Comments from the `gemini-code-assist` bot 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.  [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

vashworth added 5 commits November 25, 2025 15:51

Add a local package override for the Flutter framework and plugin

8120540

Add unit tests

a5bb8d9

++

445b6e2

++

aaba6ab

++

8040b76

github-actions Bot added tool Affects the "flutter" command-line tool. See also t: labels. a: desktop Running on desktop team-ios Owned by iOS platform team labels Dec 5, 2025

vashworth mentioned this pull request Dec 5, 2025

Add Flutter as a Swift Package dependency #178931

Merged

9 tasks done

vashworth added 2 commits January 13, 2026 16:03

Merge remote-tracking branch 'upstream/main' into swift_pm_local_pack…

ff31728

…age_overrides

fix merge conflict, add integration test

f9d857b

github-actions Bot removed the a: desktop Running on desktop label Jan 14, 2026

vashworth marked this pull request as ready for review January 14, 2026 18:06

vashworth requested a review from a team as a code owner January 14, 2026 18:06

vashworth requested a review from stuartmorgan-g January 14, 2026 18:06

gemini-code-assist Bot reviewed Jan 14, 2026

View reviewed changes

stuartmorgan-g approved these changes Jan 14, 2026

View reviewed changes

vashworth mentioned this pull request Jan 14, 2026

Add instructions to add plugin as a local override in example app flutter/website#12936

Closed

1 task done

vashworth added 3 commits January 14, 2026 14:35

Switch from class to record

a233d53

fix integration test

c1e747e

fix macOS template, fix integration test

632aea2

vashworth added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 21, 2026

auto-submit Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 21, 2026

Merge branch 'master' into swift_pm_local_package_overrides

bf7d2b8

vashworth added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 21, 2026

auto-submit Bot added this pull request to the merge queue Jan 22, 2026

Merged via the queue into flutter:master with commit a3cfa71 Jan 22, 2026
143 checks passed

flutter-dashboard Bot removed the autosubmit Merge PR when tree becomes green via auto submit App label Jan 22, 2026

vashworth mentioned this pull request Jan 22, 2026

[packages] Design analysis solution for SwiftPM packages #172427

Closed

engine-flutter-autoroll mentioned this pull request Jan 23, 2026

Roll Flutter from 48c247582e45 to bfc9041eb118 (173 revisions) flutter/packages#10862

Merged

engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 23, 2026

a3cfa715b Add FlutterFramework as an Xcode SwiftPM local package over…

f3df6b2

…ride (flutter/flutter#179512)

Shpaner mentioned this pull request Jun 17, 2026

Fix iOS SwiftPM integration for newer Flutter dotintent/flutter_blue_ultra#12

Closed

3 tasks

Navigation Menu

Repository navigation

Add FlutterFramework as an Xcode SwiftPM local package override - #179512

Add FlutterFramework as an Xcode SwiftPM local package override#179512
auto-submit[bot] merged 11 commits into
flutter:masterfrom
vashworth:swift_pm_local_package_overrides

vashworth commented Dec 5, 2025

Uh oh!

gemini-code-assist Bot left a comment

Uh oh!

stuartmorgan-g left a comment

Uh oh!

stuartmorgan-g Jan 14, 2026

Uh oh!

vashworth Jan 14, 2026

Uh oh!

stuartmorgan-g Jan 14, 2026

Uh oh!

stuartmorgan-g Jan 14, 2026

Uh oh!

vashworth Jan 14, 2026

Uh oh!

stuartmorgan-g Jan 14, 2026

Uh oh!

auto-submit Bot commented Jan 21, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

vashworth commented Dec 5, 2025

Pre-launch Checklist

Uh oh!

gemini-code-assist Bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

stuartmorgan-g left a comment

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

vashworth Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

vashworth Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Jan 14, 2026

Choose a reason for hiding this comment

Uh oh!

auto-submit Bot commented Jan 21, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants