[camera_avfoundation] Implementation swift migration #8988

RobertOdrowaz · 2025-04-03T15:07:58Z

Migrates camera implementation as part of flutter/flutter#119109

This PR includes the CameraPlugin class migration. Some additional changes regarding imports were necessary to keep Swift Package Manager compatibility. SPM does not support mixed languages in a single target. I assume there might be a better solution so I'm open to suggestions

After splitting only a new target for SPM is created in this PR and the objc implementation is moved to a dedicated directory.

During the plugin's migration from ObjC to Swift, there will be a transitional period during which the implementation will be mixed, with some parts already migrated to Swift and some still in ObjC. This is somewhat problematic with SwiftPM. SwiftPM does support packages with mixed language implementation but different languages have to be in separate targets. Every target defines a separate module which means that in some cases both have to be imported. However, this only applies to SwiftPM with Cocoapods we can mix Swift and ObjC code in the same pod and have a single module. Simmingly the best solution is to use conditional imports for the additional module when SwiftPM during the migration.

@testable import camera_avfoundation

#if canImport(camera_avfoundation_objc)
  @testable import camera_avfoundation_objc
#endif

Pre-Review Checklist

If you need help, consider asking for advice on the #hackers-new channel on Discord.

Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling. ↩ ↩² ↩³

packages/camera/camera_avfoundation/CHANGELOG.md

...ra/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation_objc/QueueUtils.m

...amera_avfoundation/Sources/camera_avfoundation_objc/include/camera_avfoundation/QueueUtils.h

packages/camera/camera_avfoundation/example/ios/RunnerTests/AvailableCamerasTests.swift

hellohuanlin · 2025-04-15T01:37:57Z

Every target defines a separate Swift module which means that in some cases both will have to be imported.

I'm confused, the ObjC target doesn't define a "swift" module right? isn't it still a clang module?

packages/camera/camera_avfoundation/ios/camera_avfoundation.podspec

hellohuanlin · 2025-04-15T01:42:56Z

packages/camera/camera_avfoundation/ios/camera_avfoundation.podspec

@@ -13,9 +13,13 @@ A Flutter plugin to use the camera from your Flutter app.
  s.author           = { 'Flutter Dev Team' => 'flutter-dev@googlegroups.com' }
  s.source           = { :http => 'https://github.com/flutter/packages/tree/main/packages/camera_avfoundation' }
  s.documentation_url = 'https://pub.dev/packages/camera_avfoundation'
-  s.source_files = 'camera_avfoundation/Sources/camera_avfoundation/**/*.{h,m}'
-  s.public_header_files = 'camera_avfoundation/Sources/camera_avfoundation/include/**/*.h'
-  s.module_map = 'camera_avfoundation/Sources/camera_avfoundation/include/CameraPlugin.modulemap'


it's been a while since i touched this. Why we are removing the module map?

It's not supported with Swift static libraries.

[!] Using Swift static libraries with custom module maps is currently not supported. Please build `camera_avfoundation` as a framework or remove the custom module map.

It's still the same issue you've encountered here flutter/plugins#6369

Oh i completely forgot about this! thanks for the reference.

hellohuanlin · 2025-04-15T01:44:27Z

packages/camera/camera_avfoundation/ios/camera_avfoundation/Package.swift

      dependencies: [],
-      exclude: ["include/camera_avfoundation-umbrella.h", "include/CameraPlugin.modulemap"],


same question to the umbrella header.

Correct me if I'm missing something but I don't see much value in having a custom umbrella header without a custom module map. Without the module map cocoapods generate the public umbrella header that includes everything either way

RobertOdrowaz · 2025-04-15T06:52:31Z

I'm confused, the ObjC target doesn't define a "swift" module right? isn't it still a clang module?

Yes, there won't be a swift module for the ObjC target. I've corrected the description

…er/packages#8988)

flutter/packages@2fcc403...ac21f53 2025-04-20 engine-flutter-autoroll@skia.org Roll Flutter from 3ed38e2 to cfb887c (17 revisions) (flutter/packages#9118) 2025-04-19 stuartmorgan@google.com [various] Scrubs pre-SDK-21 Android code (flutter/packages#9112) 2025-04-18 engine-flutter-autoroll@skia.org Roll Flutter from ecabb1a to 3ed38e2 (23 revisions) (flutter/packages#9114) 2025-04-18 ricardodalarme@outlook.com [flutter_svg] feat: Expose the `colorMapper` property in `SvgPicture` (flutter/packages#9043) 2025-04-18 stuartmorgan@google.com [tool] Add initial file-based command skipping (flutter/packages#8928) 2025-04-18 stuartmorgan@google.com [pigeon] Convert test plugins to SPM (flutter/packages#9105) 2025-04-18 10687576+bparrishMines@users.noreply.github.com [webview_flutter] Adds support to control overscrolling (flutter/packages#8451) 2025-04-17 louisehsu@google.com [in_app_purchase] add Storefront.countryCode() and AppStore.sync() (flutter/packages#8900) 2025-04-17 145144088+camfrandsen@users.noreply.github.com [webview_flutter_wkwebview] Expose the allowsLinkPreview property in WKWebView for iOS (flutter/packages#5029) 2025-04-17 10687576+bparrishMines@users.noreply.github.com [webview_flutter_android][webview_flutter_wkwebview] Adds platform implementations to set over-scroll mode (flutter/packages#9101) 2025-04-17 1063596+reidbaker@users.noreply.github.com [shared_preferences] Update AGP to 8.9.1 (flutter/packages#9106) 2025-04-17 10687576+bparrishMines@users.noreply.github.com [pigeon] Adds Kotlin lint tests to example code and fix lints (flutter/packages#9034) 2025-04-17 30872003+misos1@users.noreply.github.com [video_player_avfoundation] enable more than 30 fps (flutter/packages#7466) 2025-04-17 engine-flutter-autoroll@skia.org Roll Flutter from aef4718 to ecabb1a (25 revisions) (flutter/packages#9104) 2025-04-16 stuartmorgan@google.com [pigeon] Unify iOS and macOS test plugins (flutter/packages#9100) 2025-04-16 engine-flutter-autoroll@skia.org Roll Flutter from db68c95 to aef4718 (7 revisions) (flutter/packages#9098) 2025-04-16 10687576+bparrishMines@users.noreply.github.com [webview_flutter_platform_interface] Adds method to set overscroll mode (flutter/packages#9099) 2025-04-16 matanlurey@users.noreply.github.com Update `CODEOWNERS` (flutter/packages#8984) 2025-04-16 stuartmorgan@google.com [google_sign_is] Update iOS SDK to 8.0 (flutter/packages#9081) 2025-04-16 robert.odrowaz@leancode.pl [camera_avfoundation] Implementation swift migration (flutter/packages#8988) 2025-04-16 32538273+ValentinVignal@users.noreply.github.com [go_router] Adds `caseSensitive` to `GoRoute` (flutter/packages#8992) 2025-04-16 engine-flutter-autoroll@skia.org Manual roll Flutter from 30e53b0 to db68c95 (98 revisions) (flutter/packages#9092) 2025-04-15 stuartmorgan@google.com [tool] Run config-only build for iOS/macOS native-test (flutter/packages#9080) 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-flutter-autoroll Please CC flutter-ecosystem@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: 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

flutter/packages@2fcc403...ac21f53 2025-04-20 engine-flutter-autoroll@skia.org Roll Flutter from 409a8ac to cd51fa3 (17 revisions) (flutter/packages#9118) 2025-04-19 stuartmorgan@google.com [various] Scrubs pre-SDK-21 Android code (flutter/packages#9112) 2025-04-18 engine-flutter-autoroll@skia.org Roll Flutter from d0741df to 409a8ac (23 revisions) (flutter/packages#9114) 2025-04-18 ricardodalarme@outlook.com [flutter_svg] feat: Expose the `colorMapper` property in `SvgPicture` (flutter/packages#9043) 2025-04-18 stuartmorgan@google.com [tool] Add initial file-based command skipping (flutter/packages#8928) 2025-04-18 stuartmorgan@google.com [pigeon] Convert test plugins to SPM (flutter/packages#9105) 2025-04-18 10687576+bparrishMines@users.noreply.github.com [webview_flutter] Adds support to control overscrolling (flutter/packages#8451) 2025-04-17 louisehsu@google.com [in_app_purchase] add Storefront.countryCode() and AppStore.sync() (flutter/packages#8900) 2025-04-17 145144088+camfrandsen@users.noreply.github.com [webview_flutter_wkwebview] Expose the allowsLinkPreview property in WKWebView for iOS (flutter/packages#5029) 2025-04-17 10687576+bparrishMines@users.noreply.github.com [webview_flutter_android][webview_flutter_wkwebview] Adds platform implementations to set over-scroll mode (flutter/packages#9101) 2025-04-17 1063596+reidbaker@users.noreply.github.com [shared_preferences] Update AGP to 8.9.1 (flutter/packages#9106) 2025-04-17 10687576+bparrishMines@users.noreply.github.com [pigeon] Adds Kotlin lint tests to example code and fix lints (flutter/packages#9034) 2025-04-17 30872003+misos1@users.noreply.github.com [video_player_avfoundation] enable more than 30 fps (flutter/packages#7466) 2025-04-17 engine-flutter-autoroll@skia.org Roll Flutter from 9616f9c to d0741df (25 revisions) (flutter/packages#9104) 2025-04-16 stuartmorgan@google.com [pigeon] Unify iOS and macOS test plugins (flutter/packages#9100) 2025-04-16 engine-flutter-autoroll@skia.org Roll Flutter from a7ce7ff to 9616f9c (7 revisions) (flutter/packages#9098) 2025-04-16 10687576+bparrishMines@users.noreply.github.com [webview_flutter_platform_interface] Adds method to set overscroll mode (flutter/packages#9099) 2025-04-16 matanlurey@users.noreply.github.com Update `CODEOWNERS` (flutter/packages#8984) 2025-04-16 stuartmorgan@google.com [google_sign_is] Update iOS SDK to 8.0 (flutter/packages#9081) 2025-04-16 robert.odrowaz@leancode.pl [camera_avfoundation] Implementation swift migration (flutter/packages#8988) 2025-04-16 32538273+ValentinVignal@users.noreply.github.com [go_router] Adds `caseSensitive` to `GoRoute` (flutter/packages#8992) 2025-04-16 engine-flutter-autoroll@skia.org Manual roll Flutter from f2d54fd to a7ce7ff (98 revisions) (flutter/packages#9092) 2025-04-15 stuartmorgan@google.com [tool] Run config-only build for iOS/macOS native-test (flutter/packages#9080) 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-flutter-autoroll Please CC flutter-ecosystem@google.com on the revert to ensure that a human is aware of the problem. To file a bug in Flutter: 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

Migrates camera implementation as part of flutter/flutter#119109 ~This PR includes the `CameraPlugin` class migration. Some additional changes regarding imports were necessary to keep Swift Package Manager compatibility. SPM does not support mixed languages in a single target. I assume there might be a better solution so I'm open to suggestions~ After splitting only a new target for SPM is created in this PR and the objc implementation is moved to a dedicated directory. During the plugin's migration from ObjC to Swift, there will be a transitional period during which the implementation will be mixed, with some parts already migrated to Swift and some still in ObjC. This is somewhat problematic with SwiftPM. SwiftPM does support packages with mixed language implementation but different languages have to be in separate targets. Every target defines a separate module which means that in some cases both have to be imported. However, this only applies to SwiftPM with Cocoapods we can mix Swift and ObjC code in the same pod and have a single module. Simmingly the best solution is to use conditional imports for the additional module when SwiftPM during the migration. ```swift @testable import camera_avfoundation #if canImport(camera_avfoundation_objc) @testable import camera_avfoundation_objc #endif ``` ## Pre-Review Checklist [^1]: Regular contributors who have demonstrated familiarity with the repository guidelines only need to comment if the PR is not auto-exempted by repo tooling.

RobertOdrowaz requested a review from stuartmorgan-g April 3, 2025 15:07

RobertOdrowaz requested a review from hellohuanlin as a code owner April 3, 2025 15:07

github-actions bot added p: camera platform-ios platform-macos labels Apr 3, 2025

RobertOdrowaz force-pushed the feature/camera-implementation-swift-migration branch from 4cc7939 to 9ba0c7b Compare April 3, 2025 15:21

hellohuanlin reviewed Apr 3, 2025

View reviewed changes

packages/camera/camera_avfoundation/CHANGELOG.md Outdated Show resolved Hide resolved

RobertOdrowaz force-pushed the feature/camera-implementation-swift-migration branch from 9ba0c7b to 24ef036 Compare April 4, 2025 14:54

RobertOdrowaz requested a review from hellohuanlin April 4, 2025 14:57

hellohuanlin reviewed Apr 4, 2025

View reviewed changes

RobertOdrowaz force-pushed the feature/camera-implementation-swift-migration branch 2 times, most recently from 1d00092 to 912ce03 Compare April 5, 2025 11:52

RobertOdrowaz mentioned this pull request Apr 5, 2025

[camera_avfoundation] Implementation swift migration - part 2 #9007

Merged

11 tasks

RobertOdrowaz requested a review from hellohuanlin April 10, 2025 05:50

RobertOdrowaz force-pushed the feature/camera-implementation-swift-migration branch 2 times, most recently from c0faae7 to d99fe5c Compare April 12, 2025 17:53

hellohuanlin reviewed Apr 15, 2025

View reviewed changes

packages/camera/camera_avfoundation/ios/camera_avfoundation.podspec Show resolved Hide resolved

hellohuanlin reviewed Apr 15, 2025

View reviewed changes

Prepare package management for camera swift migration

57e7fe1

RobertOdrowaz force-pushed the feature/camera-implementation-swift-migration branch from d99fe5c to 57e7fe1 Compare April 15, 2025 06:31

RobertOdrowaz requested a review from hellohuanlin April 15, 2025 06:57

hellohuanlin approved these changes Apr 15, 2025

View reviewed changes

RobertOdrowaz added the autosubmit Merge PR when tree becomes green via auto submit App label Apr 16, 2025

auto-submit bot merged commit 7728bba into flutter:main Apr 16, 2025
82 checks passed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 16, 2025

7728bbad5 [camera_avfoundation] Implementation swift migration (flutt…

3e0e6a3

…er/packages#8988)

engine-flutter-autoroll mentioned this pull request Apr 16, 2025

Roll Packages from 2fcc4032dd8b to 7172aaad3872 (5 revisions) flutter/flutter#167274

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Apr 21, 2025

7728bbad5 [camera_avfoundation] Implementation swift migration (flutt…

424f114

…er/packages#8988)

engine-flutter-autoroll mentioned this pull request Apr 21, 2025

Roll Packages from 2fcc4032dd8b to ac21f531a0cc (23 revisions) flutter/flutter#167479

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[camera_avfoundation] Implementation swift migration #8988

[camera_avfoundation] Implementation swift migration #8988

Uh oh!

RobertOdrowaz commented Apr 3, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hellohuanlin commented Apr 15, 2025

Uh oh!

Uh oh!

hellohuanlin Apr 15, 2025 •

edited

Loading

Uh oh!

RobertOdrowaz Apr 15, 2025

Uh oh!

hellohuanlin Apr 15, 2025

Uh oh!

hellohuanlin Apr 15, 2025

Uh oh!

RobertOdrowaz Apr 15, 2025

Uh oh!

RobertOdrowaz commented Apr 15, 2025 •

edited

Loading

Uh oh!

Uh oh!

Uh oh!

		dependencies: [],
		exclude: ["include/camera_avfoundation-umbrella.h", "include/CameraPlugin.modulemap"],

[camera_avfoundation] Implementation swift migration #8988

[camera_avfoundation] Implementation swift migration #8988

Uh oh!

Conversation

RobertOdrowaz commented Apr 3, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-Review Checklist

Footnotes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

hellohuanlin commented Apr 15, 2025

Uh oh!

Uh oh!

hellohuanlin Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

RobertOdrowaz Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

hellohuanlin Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

hellohuanlin Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

RobertOdrowaz Apr 15, 2025

Choose a reason for hiding this comment

Uh oh!

RobertOdrowaz commented Apr 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RobertOdrowaz commented Apr 3, 2025 •

edited

Loading

hellohuanlin Apr 15, 2025 •

edited

Loading

RobertOdrowaz commented Apr 15, 2025 •

edited

Loading