[various] Scrub pre-iOS-13 code #9849

stuartmorgan-g · 2025-08-19T14:53:25Z

For all packages that had conditionals to support iOS <13:

Update the min Flutter version to 3.35, which requires iOS 13
Remove the conditional logic
Update all the project metadata to require iOS 13+ (and macOS 10.15+ where applicable)

There is also some minor cleanup in in_app_purchase_storekit; just removing conditionals would have left cases where we were unnecessarily constructing dictionaries dynamically, so I folded them into the initial dictionary construction, and while doing that I noticed some cases where we were doing other unnecessary dynamic construction (maybe due to previous OS conditionals?) so I updated those as well. And then I noticed some inconsistency in use of WithCapacity: and updated those cases to be consistent. Lastly, I fixed a few stale comments that didn't reflect the current state of the code.

Includes autoformat changes, since updating the min Dart SDK opts into some formatter changes.

Fixes flutter/flutter#167735

Pre-Review Checklist

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 effectively removes support for iOS versions older than 13.0 across several packages, which simplifies the codebase by removing conditional logic and updating deployment targets. The changes are well-executed and include valuable refactoring in in_app_purchase_storekit to improve code clarity and performance by using dictionary literals and pre-allocating array capacities. I've found one minor inconsistency in the test stubs related to array initialization that could be addressed for better consistency with the rest of the changes.

gemini-code-assist · 2025-08-19T14:57:07Z

packages/in_app_purchase/in_app_purchase_storekit/example/shared/RunnerTests/Stubs.m

-      }
-
-      [self setValue:discounts forKey:@"discounts"];
+    NSMutableArray *discounts = [[NSMutableArray alloc] init];


For consistency with the other changes in this PR, it would be better to initialize this mutable array with a specific capacity, since the size is known. You've done this in FIAObjectTranslator.m, and applying the same pattern here would be a nice touch.

Suggested change

NSMutableArray *discounts = [[NSMutableArray alloc] init];

NSMutableArray *discounts = [NSMutableArray arrayWithCapacity:[map[@"discounts"] count]];

stuartmorgan-g · 2025-08-28T19:08:35Z

This is actually ready for review now; apologies for not marking it as a draft when I first posted it.

vashworth · 2025-08-28T22:01:40Z

...h/local_auth_darwin/darwin/local_auth_darwin/Sources/local_auth_darwin/LocalAuthPlugin.swift

-          return biometrics
-        }
+      if context.biometryType == LABiometryType.faceID {
+        biometrics.append(AuthBiometric.face)


Does this not need to return?

It doesn't actually matter, and the early return confused someone in an earlier review of adjacent code so I thought I'd remove it.

If you look at the context, this is structured as conditionally populating an array with potentially multiple elements, but in practice only one entry ever ends up in the array because biometryType is a singular value. So this early return doesn't do anything different from the return ~6 lines down.

vashworth

LGTM

flutter/packages@5d785a0...42bb347 2025-09-03 [email protected] [google_maps_flutter] Fixes exception when dispose is called while asynchronous update from didUpdateWidget is executed (flutter/packages#9227) 2025-09-03 [email protected] [google_maps_flutter] Add cameraControl enable/disable & position on web (flutter/packages#9089) 2025-09-03 [email protected] [tool] Only license-check checked-in files (flutter/packages#9905) 2025-09-03 [email protected] [interactive_media_ads] Fixes preloading ad while another was playing on Android (flutter/packages#9904) 2025-09-02 [email protected] Update FWFWebViewFlutterWKWebViewExternalAPITests.swift (flutter/packages#9922) 2025-09-02 [email protected] Update Stubs for FlutterPluginRegistrar interface change (flutter/packages#9923) 2025-09-02 [email protected] [camera_android_camerax] Update Android minimum SDK version (flutter/packages#9945) 2025-09-02 [email protected] Roll Flutter from da5523a to 6b18740 (49 revisions) (flutter/packages#9926) 2025-09-02 [email protected] [various] Scrub pre-iOS-13 code (flutter/packages#9849) 2025-09-02 [email protected] [google_maps_flutter_web] Add cameraControl enable/disable & position on web (flutter/packages#9921) 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 [email protected] 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

For all packages that have not already done so: - Ensure that the minimum iOS version is 13. - Ensure that the minimum macOS version is 10.15. - Ensure that the minimum Flutter SDK version in 3.35 for anything with changes from the above. In #9849 I did the iOS plugins that had conditional logic for iOS <13, but I forgot to follow up with updating the minimum for the plugins that didn't have conditional logic. Because this changes min Dart SDKs, it causes autoformat changes. There are no actual code changes in this PR; all Dart file changes are purely the result of re-running `dart format`. This does bump the versions, even though repo policy would allow skipping version bumps for only changing min requirements, just to avoid conflating all the changes here with future releases. Part of flutter/flutter#167735 Part of flutter/flutter#167745 ## 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.

flutter/packages@5d785a0...42bb347 2025-09-03 [email protected] [google_maps_flutter] Fixes exception when dispose is called while asynchronous update from didUpdateWidget is executed (flutter/packages#9227) 2025-09-03 [email protected] [google_maps_flutter] Add cameraControl enable/disable & position on web (flutter/packages#9089) 2025-09-03 [email protected] [tool] Only license-check checked-in files (flutter/packages#9905) 2025-09-03 [email protected] [interactive_media_ads] Fixes preloading ad while another was playing on Android (flutter/packages#9904) 2025-09-02 [email protected] Update FWFWebViewFlutterWKWebViewExternalAPITests.swift (flutter/packages#9922) 2025-09-02 [email protected] Update Stubs for FlutterPluginRegistrar interface change (flutter/packages#9923) 2025-09-02 [email protected] [camera_android_camerax] Update Android minimum SDK version (flutter/packages#9945) 2025-09-02 [email protected] Roll Flutter from da5523a to 6b18740 (49 revisions) (flutter/packages#9926) 2025-09-02 [email protected] [various] Scrub pre-iOS-13 code (flutter/packages#9849) 2025-09-02 [email protected] [google_maps_flutter_web] Add cameraControl enable/disable & position on web (flutter/packages#9921) 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 [email protected] 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

stuartmorgan-g added 5 commits August 19, 2025 10:24

Scrub webview

c58e472

Scrub IAP, and minor cleanup

0060a44

Scrub local_auth

ce65fc1

Scrub camera

03e84a5

Fix stale comments

2c80270

stuartmorgan-g requested review from LongCatIsLooong, LouiseHsu, hellohuanlin and vashworth as code owners August 19, 2025 14:53

github-actions bot added p: camera p: in_app_purchase p: local_auth platform-ios platform-macos p: webview_flutter labels Aug 19, 2025

gemini-code-assist bot reviewed Aug 19, 2025

View reviewed changes

This comment was marked as resolved.

Sign in to view

stuartmorgan-g added 5 commits August 27, 2025 16:27

Merge branch 'main' into ios-13-min-scrub

5466e63

Merge branch 'main' into ios-13-min-scrub

2fb1ef7

Autoformat

041643f

Lint fix

df174fc

Add missing casting

a9a69e7

vashworth reviewed Aug 28, 2025

View reviewed changes

vashworth approved these changes Aug 29, 2025

View reviewed changes

Merge branch 'main' into ios-13-min-scrub

ad523f5

stuartmorgan-g added the autosubmit Merge PR when tree becomes green via auto submit App label Sep 2, 2025

auto-submit bot merged commit d3e0285 into flutter:main Sep 2, 2025
80 checks passed

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

d3e0285 [various] Scrub pre-iOS-13 code (flutter/packages#9849)

7e998f9

engine-flutter-autoroll mentioned this pull request Sep 3, 2025

Roll Packages from 5d785a06c091 to 42bb34706103 (10 revisions) flutter/flutter#174876

Merged

stuartmorgan-g mentioned this pull request Oct 14, 2025

[various] Update min iOS/macOS versions #10231

Merged

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[various] Scrub pre-iOS-13 code #9849

[various] Scrub pre-iOS-13 code #9849

Uh oh!

stuartmorgan-g commented Aug 19, 2025 •

edited

Loading

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

gemini-code-assist bot Aug 19, 2025

Uh oh!

This comment was marked as resolved.

stuartmorgan-g commented Aug 28, 2025

Uh oh!

vashworth Aug 28, 2025

Uh oh!

stuartmorgan-g Aug 29, 2025

Uh oh!

vashworth left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	NSMutableArray *discounts = [[NSMutableArray alloc] init];
	NSMutableArray *discounts = [NSMutableArray arrayWithCapacity:[map[@"discounts"] count]];

[various] Scrub pre-iOS-13 code #9849

[various] Scrub pre-iOS-13 code #9849

Uh oh!

Conversation

stuartmorgan-g commented Aug 19, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pre-Review Checklist

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

gemini-code-assist bot Aug 19, 2025

Choose a reason for hiding this comment

Uh oh!

This comment was marked as resolved.

stuartmorgan-g commented Aug 28, 2025

Uh oh!

vashworth Aug 28, 2025

Choose a reason for hiding this comment

Uh oh!

stuartmorgan-g Aug 29, 2025

Choose a reason for hiding this comment

Uh oh!

vashworth left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

stuartmorgan-g commented Aug 19, 2025 •

edited

Loading