[camera_avfoundation] Pigeon swift migration - part 2 by RobertOdrowaz · Pull Request #10980 · flutter/packages

RobertOdrowaz · 2026-02-08T19:30:07Z

Migrates camera package to the Swift-based pigeon interface as the last part of flutter/flutter#119109

This PR replaces the ObjC-based pigeon interfaces with Swift-based ones, thus removing the last remaining pieces of ObjC code in the package 🎉

I know there are a lot of changes in this PR, but there is no way to split it into smaller parts.

Pre-Review 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-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.

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

gemini-code-assist

Code Review

This pull request completes the migration of the camera_avfoundation package to a Swift-based Pigeon interface, removing the last Objective-C-based Pigeon interfaces. The changes are extensive and primarily involve:

Replacing Objective-C generated Pigeon files with new Swift-generated ones (Messages.swift).
Updating the CameraApi implementation in CameraPlugin.swift and DefaultCamera.swift to use the new Swift types and Result-based completion handlers.
Removing the Objective-C Pigeon target and related source files.
Updating all unit and integration tests to align with the new Swift API, including changes to mock objects and assertions to handle Result and PigeonError types.
Adjusting the podspec and Package.swift files to reflect the removal of the Objective-C target.

My feedback focuses on improving the maintainability of the updated test files by reducing code duplication.

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

...s/camera/camera_avfoundation/example/ios/RunnerTests/CameraPluginDelegatingMethodTests.swift

RobertOdrowaz · 2026-02-10T20:23:15Z

@hellohuanlin pls take a look at this PR when you have some time

hellohuanlin · 2026-02-10T23:17:24Z

@RobertOdrowaz Hello, this PR is 2000 LOC and all in a single commit. Could you give a tour of the change and how i can start reviewing it, if possible?

RobertOdrowaz · 2026-02-11T21:54:54Z

I know it's over 2000 LOC, but the vast majority are trivial changes:

~1300 LOC is in Messages.swift which is generated by pigeon
~600 LOC in tests which is mostly very repetitive change from something like

camera.setZoomLevel(CGFloat(1.0)) { error in
      XCTAssertNotNil(error)
      XCTAssertEqual(error?.code, "ZOOM_ERROR")
      expectation.fulfill()
    }

to

camera.setZoomLevel(CGFloat(1.0)) { result in
      switch result {
      case .failure(let error as PigeonError):
        XCTAssertEqual(error.code, "ZOOM_ERROR")
      default:
        XCTFail("Expected failure")
      }
      expectation.fulfill()
    }

because methods now pass a Result union type instead of nullable error to the completion.

~100 LOC in CameraPlugin.swift mostly changes from nullable error to a Result in completions
~140 LOC in DefaultCamera.swift mostly changes from nullable error to a Result and PigeonError instead of FlutterError.

I can split 1, 2 and 3+4 into separate commits if it will help you but IMO going file by file is effectively the same.

hellohuanlin · 2026-02-11T22:11:22Z

@RobertOdrowaz Thanks for the tour. Don't worry about splitting it. Taking a look now.

hellohuanlin

LGTM with just a few questions

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

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

hellohuanlin · 2026-02-12T21:36:27Z

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

      handler(false)
    }
    permissionManager.requestCameraPermission { error in
-      XCTAssertEqual(error, expectedError)


curious why are we changing this? I don't see any problem with this approach. Is it related to equatable?

FlutterError was equatable PigeonError is not

Global function 'XCTAssertEqual(::_:file:line:)' requires that 'PigeonError' conform to 'Equatable'

Gotcha. I think you can also write an extension of PigeonError to conform to Equatable.

I filed an issue here: flutter/flutter#182480

...s/camera/camera_avfoundation/example/ios/RunnerTests/CameraPluginDelegatingMethodTests.swift

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

hellohuanlin · 2026-02-12T21:40:33Z

.../camera/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/Camera.swift

  /// @param messenger Nullable messenger for capturing each frame.
  func startVideoRecording(
-    completion: @escaping (_ error: FlutterError?) -> Void,
+    completion: @escaping (Result<Void, any Error>) -> Void,


why is it changing from FlutterError to any Error?

I matches the completion interface generated by pigeon. We can have Result<Void, PigeonError> in Camera but I think that due to generics invariance in Swift we would have to map the errors like this
completion: { completion($0.mapError { $0 }) } in CameraPlugin

packages/camera/camera_avfoundation/ios/camera_avfoundation.podspec

RobertOdrowaz · 2026-02-16T18:31:53Z

...a/camera_avfoundation/ios/camera_avfoundation/Sources/camera_avfoundation/CameraPlugin.swift

+        completion(.success(isSupported))
      } else {
-        completion(nil, nil)
+        completion(.success(false))


I'm keeping the existing behavior and not adding error handling here. I can open an issue for this

RobertOdrowaz · 2026-02-16T18:33:31Z

@hellohuanlin I've resolved the conflicts and your comments. I will wait for your approval on #10980 (comment) before merging

hellohuanlin

LGTM

RobertOdrowaz · 2026-02-18T14:59:26Z

@hellohuanlin That was the last PR for the camera migration. Thank you for the reviews throughout the whole process!

…ter/packages#10980)

flutter/packages@f83926f...59f905c 2026-02-18 52160996+FMorschel@users.noreply.github.com [camera][google_fonts] Fixes future warning for `await`ing `Future` returns in `async` bodies inside `try` blocks (flutter/packages#11009) 2026-02-18 robert.odrowaz@leancode.pl [camera_avfoundation] Pigeon swift migration - part 2 (flutter/packages#10980) 2026-02-17 8490712+ruicraveiro@users.noreply.github.com [camera_android_camerax] Adds support for video stabilization (flutter/packages#11020) 2026-02-17 nateshmbhat1@gmail.com [video_player] Adds audio track metadata fetching and audio track selection feature (flutter/packages#9925) 2026-02-17 stuartmorgan@google.com [video_player] Update Android to exoplayer 1.9.1 (flutter/packages#10904) 2026-02-17 joonas.kerttula@codemate.com [google_maps_flutter_android] Add advanced markers support (flutter/packages#10381) 2026-02-17 stuartmorgan@google.com [google_maps_flutter] Standardize iOS class and file names (flutter/packages#10964) 2026-02-17 stuartmorgan@google.com [google_sign_in] Simply Kotlin/Java interop utils (flutter/packages#11011) 2026-02-17 engine-flutter-autoroll@skia.org Roll Flutter from 9bda20a to 6e4a481 (103 revisions) (flutter/packages#11041) 2026-02-17 stuartmorgan@google.com [ci] Update repo for 3.41 (flutter/packages#11017) 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

Migrate to Swift-based pigeon interface

c4f140a

RobertOdrowaz requested review from LouiseHsu and hellohuanlin as code owners February 8, 2026 19:30

github-actions bot added p: camera platform-ios platform-macos labels Feb 8, 2026

gemini-code-assist bot reviewed Feb 8, 2026

View reviewed changes

packages/camera/camera_avfoundation/example/ios/RunnerTests/CameraPermissionTests.swift Show resolved Hide resolved

...s/camera/camera_avfoundation/example/ios/RunnerTests/CameraPluginDelegatingMethodTests.swift Show resolved Hide resolved

stuartmorgan-g added the triage-ios Should be looked at in iOS triage label Feb 10, 2026

hellohuanlin approved these changes Feb 12, 2026

View reviewed changes

RobertOdrowaz added 2 commits February 16, 2026 18:57

Merge branch 'main' into feature/camera-pigeon-swift-migration-part2

0ca4f6d

Resolve PR comments

779860d

RobertOdrowaz force-pushed the feature/camera-pigeon-swift-migration-part2 branch from 4bd9a26 to 779860d Compare February 16, 2026 18:29

RobertOdrowaz commented Feb 16, 2026

View reviewed changes

RobertOdrowaz requested a review from hellohuanlin February 16, 2026 18:33

hellohuanlin mentioned this pull request Feb 16, 2026

[ios][pigeon] Make PigeonError Equatable flutter/flutter#182480

Open

hellohuanlin approved these changes Feb 16, 2026

View reviewed changes

Merge branch 'main' into feature/camera-pigeon-swift-migration-part2

9f79f53

RobertOdrowaz added the autosubmit Merge PR when tree becomes green via auto submit App label Feb 18, 2026

auto-submit bot merged commit 66b0cce into flutter:main Feb 18, 2026
81 checks passed

RobertOdrowaz mentioned this pull request Feb 18, 2026

[camera] iOS Swift migration flutter/flutter#119109

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 18, 2026

66b0cce4a [camera_avfoundation] Pigeon swift migration - part 2 (flut…

95a2906

…ter/packages#10980)

engine-flutter-autoroll mentioned this pull request Feb 18, 2026

Roll Packages from f83926f04ca8 to 66b0cce4a1d9 (9 revisions) flutter/flutter#182543

Closed

engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Feb 18, 2026

66b0cce4a [camera_avfoundation] Pigeon swift migration - part 2 (flut…

fefa752

…ter/packages#10980)

engine-flutter-autoroll mentioned this pull request Feb 18, 2026

Roll Packages from f83926f04ca8 to 59f905ced6b8 (10 revisions) flutter/flutter#182547

Merged

Conversation

RobertOdrowaz commented Feb 8, 2026

Pre-Review Checklist

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

RobertOdrowaz commented Feb 10, 2026

Uh oh!

hellohuanlin commented Feb 10, 2026

Uh oh!

RobertOdrowaz commented Feb 11, 2026

Uh oh!

hellohuanlin commented Feb 11, 2026

Uh oh!

hellohuanlin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

hellohuanlin Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

RobertOdrowaz Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

hellohuanlin Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

hellohuanlin Feb 12, 2026

Choose a reason for hiding this comment

Uh oh!

RobertOdrowaz Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

RobertOdrowaz Feb 16, 2026

Choose a reason for hiding this comment

Uh oh!

RobertOdrowaz commented Feb 16, 2026

Uh oh!

hellohuanlin left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

RobertOdrowaz commented Feb 18, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments