Build App and native asset frameworks for Add to App FlutterPluginRegistrant#183136
Build App and native asset frameworks for Add to App FlutterPluginRegistrant#183136auto-submit[bot] merged 3 commits intoflutter:masterfrom
Conversation
There was a problem hiding this comment.
Code Review
This pull request introduces the capability to build App.xcframework and native asset frameworks for 'Add to App' scenarios, primarily enhancing the build swift-package command. The core logic is encapsulated in a new AppFrameworkAndNativeAssetsDependencies class, which handles the creation of XCFrameworks for different build configurations and platforms. The changes are well-structured and include corresponding updates to build targets and tests. My feedback focuses on improving code conciseness and adding a clarifying comment for better maintainability.
packages/flutter_tools/lib/src/build_system/targets/assets.dart
Outdated
Show resolved
Hide resolved
packages/flutter_tools/lib/src/commands/build_swift_package.dart
Outdated
Show resolved
Hide resolved
stuartmorgan-g
left a comment
There was a problem hiding this comment.
LGTM
The usual caveats here apply that I don't work with this part of the build system enough that I am likely to notice if there are subtle mistakes in the actual output produced by this (e.g., the kinds of issues we've seen with native assets that only show up in app store submission), but all of the structure, steps, and testing are clear and make sense to me, so this looks like a solid foundation even if we end up needing to iterate slightly on the details.
hellohuanlin
left a comment
There was a problem hiding this comment.
Overall logic looks good. Just a few questions since I'm not too familiar with this code base.
| @override | ||
| Future<bool> canSkip(Environment environment) async { | ||
| // The `build swift-package` command copies the Flutter.xcframework separately and therefore | ||
| // does not need it to be done by the build system. |
There was a problem hiding this comment.
ask to learn: what does unpack darwin do, and can you elaborate more why skip here?
| for (final ExceptionMeasurement measurement in result.exceptions.values) { | ||
| _utils.logger.printError(measurement.exception.toString()); | ||
| } | ||
| throwToolExit('The $_appBinaryName.xcframework build failed.'); |
There was a problem hiding this comment.
should this be .framework rather than .xcframework?
| /// .target( | ||
| /// name: "FlutterPluginRegistrant", | ||
| /// dependencies: [ | ||
| /// .target(name: "App"), |
| case FlutterDarwinPlatform.macos: | ||
| manifestFile = outputDirectory | ||
| .childDirectory('App.framework') | ||
| .childDirectory('Resources') |
There was a problem hiding this comment.
I assume this is a requirement on mac that all the assets need to be under Resources?
There was a problem hiding this comment.
Apple adjusted the bundle formats somewhat for iOS relative to macOS, so they have similar-but-not-identical directory structures (both app and framework).
| addSplitDebugInfoOption(); | ||
| addDartObfuscationOption(); | ||
| usesExtraDartFlagOptions(verboseHelp: verboseHelp); | ||
| addEnableExperimentation(hide: !verboseHelp); |
Roll Flutter from 46fb7210422d to d3dd7744e81f (33 revisions) flutter/flutter@46fb721...d3dd774 2026-03-04 [email protected] Show warning when plugins do not support SwiftPM (flutter/flutter#182506) 2026-03-04 [email protected] Give guided message when project is not compatible with SwiftPM (flutter/flutter#182394) 2026-03-04 [email protected] Pass --web-define through to web runner when using --machine mode (flutter/flutter#183228) 2026-03-04 [email protected] Improve SwiftPM minimum platform mismatch diagnostics (flutter/flutter#182375) 2026-03-04 [email protected] Use dart::bin::SetupDartIo to setup dart:io (flutter/flutter#176714) 2026-03-04 [email protected] Roll Skia from 3197848b14ad to ada0b7628c79 (5 revisions) (flutter/flutter#183221) 2026-03-04 [email protected] Roll Skia from fe9e9f22c531 to 3197848b14ad (15 revisions) (flutter/flutter#183198) 2026-03-04 [email protected] refactor: remove material in reorderable_list_test, scroll_notification_test, scroll_physics_test, shortcuts_test, sliver_floating_header_test, snapshot_widget_test (flutter/flutter#182698) 2026-03-04 [email protected] refactor: remove material in pop_scope_test, route_notification_message_test, two_dimensional_utils, two_dimensional_viewport_test (flutter/flutter#182699) 2026-03-04 [email protected] Add dev/benchmarks/README.md (flutter/flutter#182976) 2026-03-03 [email protected] Roll RapidJSON to a branch based on the current upstream head (flutter/flutter#183048) 2026-03-03 [email protected] [Impeller] Update comments to reflect new info about 2-pass rendering (flutter/flutter#183050) 2026-03-03 [email protected] Add vmservices for accessibilityEvaluation (flutter/flutter#182791) 2026-03-03 [email protected] Roll Fuchsia Linux SDK from 0dCDM2oORHwDf_pyb... to JJw5EJ87vLGqFVl4h... (flutter/flutter#183177) 2026-03-03 [email protected] Support mixed color spaces in `Color.lerp` (flutter/flutter#182934) 2026-03-03 [email protected] Add warning when there is a widget with color between `Material` and `ListTile` (flutter/flutter#181402) 2026-03-03 [email protected] [ios]uitest for admob banner in scrollable list gesture issue (flutter/flutter#183128) 2026-03-03 [email protected] Roll Packages from faa4e22 to 9083bc9 (4 revisions) (flutter/flutter#183164) 2026-03-03 [email protected] Build App and native asset frameworks for Add to App FlutterPluginRegistrant (flutter/flutter#183136) 2026-03-03 [email protected] Roll Skia from f886711f180d to fe9e9f22c531 (4 revisions) (flutter/flutter#183155) 2026-03-03 [email protected] Roll Dart SDK from e86dbe9aa742 to c597ef90d2dc (2 revisions) (flutter/flutter#183147) 2026-03-03 [email protected] fix: bump matcher (flutter/flutter#183167) 2026-03-02 [email protected] Use isA to test for exceptions (flutter/flutter#183129) 2026-03-02 [email protected] [two_dimensional_scrollables] Fix tableview janks when first row/column pinned (flutter/flutter#180563) 2026-03-02 [email protected] Add await to callsites of BasicMessageChannel.send (flutter/flutter#182868) 2026-03-02 [email protected] Roll pub packages (flutter/flutter#183133) 2026-03-02 [email protected] Improve FFI code for windowing (flutter/flutter#183098) 2026-03-02 [email protected] [workflow] Update the changelog merge action to fetch the stable branch (flutter/flutter#183132) 2026-03-02 [email protected] Roll Skia from e180358b7a7a to f886711f180d (2 revisions) (flutter/flutter#183130) 2026-03-02 [email protected] Merge changelog from 3.41.3. (flutter/flutter#183131) 2026-03-02 [email protected] Make TextDecoration final and unify maskValue across platforms (flutter/flutter#183070) 2026-03-02 [email protected] Roll pub packages (flutter/flutter#182640) 2026-03-02 [email protected] Enable SwiftPM by default on master and beta (flutter/flutter#182923) 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],[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: ...
…istrant (flutter#183136) Generates XCFrameworks for the App and any native assets and places them with the `FlutterPluginRegistrant` Swift package. ``` ├── FlutterPluginRegistrant │ ├── Debug/Profile/Release │ │ ├── Frameworks │ │ │ ├── App.xcframework │ │ │ ├── NativeAssets │ │ │ │ ├── my_native_asset.xcframework ``` Build artifacts are stored in a `.cache` directory to make incremental builds faster. Fixes flutter#181209. ## 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
Generates XCFrameworks for the App and any native assets and places them with the
FlutterPluginRegistrantSwift package.Build artifacts are stored in a
.cachedirectory to make incremental builds faster.Fixes #181209.
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.