mirror of
https://github.com/flutter/flutter.git
synced 2026-02-20 02:29:02 +08:00
d316469e1d
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: https://github.com/flutter/flutter/pull/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 https://github.com/flutter/flutter/issues/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. <!-- 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