Skip to content

Commit 20189e5

Browse files
aednlaxeraednlaxer
committed
Squashed commit of the following:
commit cbdb48a0bcee5865e6e5d29826d6f44cc1f0984d Author: engine-flutter-autoroll <[email protected]> Date: Wed Dec 11 23:50:26 2024 -0500 Manual roll Flutter from 918b2b9ddb43 to f559e16010a0 (4 revisions) (#8277) Manual roll requested by [email protected] https://github.com/flutter/flutter/compare/918b2b9ddb43...f559e16010a0 2024-12-12 [email protected] Roll Flutter Engine from e3524615fb69 to 92de3d0f8830 (1 revision) (flutter/flutter#160132) 2024-12-12 [email protected] Roll Flutter Engine from b8034f152711 to e3524615fb69 (2 revisions) (flutter/flutter#160128) 2024-12-11 [email protected] Roll Flutter Engine from ba7ad8719733 to b8034f152711 (3 revisions) (flutter/flutter#160126) 2024-12-11 [email protected] Roll Flutter Engine from 3cdd84160baa to ba7ad8719733 (1 revision) (flutter/flutter#160117) 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: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md commit 26373787d5c768a21befaec34300efb2df84cb52 Author: Tarrin Neal <[email protected]> Date: Wed Dec 11 18:40:10 2024 -0800 disable maps test and manual roll (#8275) Disables failing test while we wait for framework to look into bug https://github.com/flutter/flutter/issues/160115 manual roll commit 8238e1c5ada8c6a99f7fb6087484b52face33721 Author: Sinyu <[email protected]> Date: Thu Dec 12 02:57:58 2024 +0800 [quick_actions] add localizedSubtitle for iOS (#8038) Add the localizedSubtitle field on quick actions for iOS https://github.com/flutter/flutter/issues/129759 Pre-launch Checklist I read and followed the [relevant style guides](https://github.com/flutter/packages/blob/main/CONTRIBUTING.md#style) and ran the auto-formatter. (Unlike the flutter/flutter repo, the flutter/packages repo does use dart format.) commit 374d1bef1033688165359ee7b76330139d9c3cb8 Author: Naomi Watanabe <[email protected]> Date: Thu Dec 12 02:43:26 2024 +0900 [video_player_avfoundation] Support the audio-only HLS (.m3u8) on iOS (#7890) Supports the audio-only HLS on iOS. After through https://github.com/flutter/plugins/pull/4639 and https://github.com/flutter/plugins/pull/4727, we can play HLS videos and audios, but it does not support audio-only HLS. When attempting to play that on iOS, it never finishes initialization. Show the before/after demonstration here: https://github.com/flutter/flutter/issues/156589#issuecomment-2408846446 Fixes: https://github.com/flutter/flutter/issues/156589 Test with https://github.com/flutter/assets-for-api-docs/pull/252 commit 16616ad588d7ad9c00958ec61022e5b5dde5f5dd Author: engine-flutter-autoroll <[email protected]> Date: Tue Dec 10 16:13:19 2024 -0500 Manual roll Flutter from ab5b20c16d56 to 456366232af9 (10 revisions) (#8264) Manual roll requested by [email protected] https://github.com/flutter/flutter/compare/ab5b20c16d56...456366232af9 2024-12-05 [email protected] [ci] Add google_adsense to 9_first_party_packages.yml (flutter/flutter#159827) 2024-12-05 [email protected] [flutter_tools] configure shader compiler to output GLES3 shaders for Android. (flutter/flutter#159857) 2024-12-05 [email protected] Introduce Material 3 `year2023` flag to `ProgressIndicatorThemeData` (flutter/flutter#159720) 2024-12-05 [email protected] Updated Material 3 `Slider` Samples (flutter/flutter#159795) 2024-12-05 [email protected] Updated Material 3 Progress Indicators Samples (flutter/flutter#158925) 2024-12-05 [email protected] Remove some usages of package:usage (flutter/flutter#159705) 2024-12-05 [email protected] Fixed typos (flutter/flutter#159331) 2024-12-05 [email protected] Reland Fix Date picker overlay colors aren't applied on selected state (flutter/flutter#159839) 2024-12-05 [email protected] fix failing lint in MainActivity.kt.tmpl (flutter/flutter#159441) 2024-12-05 [email protected] Roll Flutter Engine from 05e2d6597cb2 to b4f52b275535 (1 revision) (flutter/flutter#159842) 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: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md commit a02deb49c1f6bcb8bb895dd67fbf36ac2c9738bd Author: Sinyu <[email protected]> Date: Tue Dec 10 23:59:05 2024 +0800 [quick_action_ios] add localizedSubtitle for iOS (#8149) This is prequel PR for: https://github.com/flutter/packages/pull/8038 Containing only changes to quick_action_ios package. Add the localizedSubtitle field on quick actions for iOS https://github.com/flutter/flutter/issues/129759 commit 0f1fd493b893c02ac37544cfd31f5c4f184202db Author: Camille Simon <[email protected]> Date: Mon Dec 9 15:58:25 2024 -0500 [dependabot] Generalizes dependabot commit message prefix (#8255) Changes dependabot commit message prefix from "[gradle]" to "[dependabot]" since dependabot handles more than Gradle updates. Also updates dependabot configuration docs link since the one included didn't work for me. commit 2dc8b98a2c0da9e7f44eaed385cca98e62c3093e Author: David Iglesias <[email protected]> Date: Mon Dec 9 11:03:04 2024 -0800 [google_adsense] Tighten exports and docs. (#8233) * **Breaking changes**: Reshuffles API exports: * Removes the `adUnit` method, and instead exports the `AdUnitWidget` directly. * Renames `experimental/google_adsense` to `experimental/ad_unit_widget.dart`. * Removes the `AdStatus` and `AdUnitParams` exports. * Removes the "stub" files, so this package is now web-only and must be used through a conditional import. * Tweaks several documentation pages to remove references to internal APIs. * Splits tests to reflect the new code structure. ## Issue * Continuation of: https://github.com/flutter/packages/pull/6871 * Part of: https://github.com/flutter/flutter/issues/40376 commit 9f6d5998784826a0741be8370c95a5ab458bba41 Author: stuartmorgan <[email protected]> Date: Mon Dec 9 09:44:19 2024 -0800 [path_provider] Clean up Java code (#8240) Minor cleanup in the native implementation code: - Removes a utility to map from index integers to directories, which hasn't been used since the Pigeon conversion but was accidentally left. - Inlines all the implementations of path getters; many methods were pointlessly delegating their implementation to another private method, which is a relic of the pre-Pigeon structure. All of the method implementations were moved without any changes. commit ebe5367e4d31150718db4de23c0448efaa501ef9 Author: stuartmorgan <[email protected]> Date: Mon Dec 9 09:44:17 2024 -0800 [google_sign_in] Clean up Java code (#8241) Removes the legacy public native interface to the sign-in plugin, which was inherently linked to raw method channels (which we no longer use) and the structure of the Google Sign-In native SDK (which is deprecated), so we don't want to continue supporting. I (unsurprisingly, as native->native plugin dependencies are very rare) can't find any evidence that any public plugin has ever directly used this Java code. The original use case this was added for was internal, and no longer exists (see b/158361263). The test file being deleted is specific to the legacy interface. There is already an almost-exact duplicate of that test file that tests the Pigeon interface. commit 45bcc3210fcc24011bc7f88de1ca61528d9e5cbc Author: Loïc Sharma <[email protected]> Date: Thu Dec 5 13:54:59 2024 -0800 [various] Add Swift Package Manager integration to Google sign in example apps (#8230) This migrates the following plugins' example apps to have Swift Package Manager integration: 1. google_sign_in 2. google_sign_in_ios This also checks-in CocoaPods integration stuff that was missing. This raises the example apps' Flutter SDK requirement to 3.24.0 or higher. I will get a text exemption for this change. The example apps were migrated using the following commands: ``` dart run script/tool/bin/flutter_plugin_tools.dart build-examples --ios --swift-package-manager dart run script/tool/bin/flutter_plugin_tools.dart build-examples --macos --swift-package-manager ``` Completes: https://github.com/flutter/flutter/issues/159173 commit 824d91ab4858d16f24e010cd8691670d83ceb0f3 Author: engine-flutter-autoroll <[email protected]> Date: Thu Dec 5 10:55:06 2024 -0500 Roll Flutter from e1e4ee9a016e to ab5b20c16d56 (7 revisions) (#8236) https://github.com/flutter/flutter/compare/e1e4ee9a016e...ab5b20c16d56 2024-12-05 [email protected] Roll Flutter Engine from 8d3c71840069 to 05e2d6597cb2 (4 revisions) (flutter/flutter#159836) 2024-12-05 [email protected] Roll Flutter Engine from 9e8fcad4eaf6 to 8d3c71840069 (3 revisions) (flutter/flutter#159818) 2024-12-04 [email protected] Add `flutter widget-preview {start, clean}` commands (flutter/flutter#159510) 2024-12-04 [email protected] Roll Flutter Engine from 1f7f37e264b0 to 9e8fcad4eaf6 (2 revisions) (flutter/flutter#159808) 2024-12-04 [email protected] Roll Flutter Engine from 29d66405e6df to 1f7f37e264b0 (2 revisions) (flutter/flutter#159805) 2024-12-04 [email protected] Fix: Update PopupMenu position when layout changes (flutter/flutter#157983) 2024-12-04 [email protected] [Android] Removes dev dependency plugins from release builds (flutter/flutter#158026) 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] 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: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md commit 8522c9e82f4ef0d1317d69dbc2eeadfefefce263 Author: stuartmorgan <[email protected]> Date: Thu Dec 5 07:29:22 2024 -0500 [various] Update iOS/macOS Pigeon versions (#8226) Updates iOS and macOS plugin implementations that were still using Pigeon 10/11 to the latest version (22). This picks up some minor improvements to serialization, as well as newer dependencies that can avoid resolver issues in flutter/flutter tests (see linked issue). Most of this PR is auto-generated via the repo tool's `update-dependency` command; only minor manual updates were required (mostly to test code). Fixes https://github.com/flutter/flutter/issues/159803 commit 953c683ca2bc4d6a497ccc78d6b3e66e9fa2e287 Author: David Iglesias <[email protected]> Date: Thu Dec 5 04:25:09 2024 -0800 [ci] Adds google_adsense to labeler.yml (#8231) Updates some CI config for `package:google_adsense`: * Configures `labeler.yaml` to add `p: google_adsense` to PRs with changes to `packages/google_adsense` * Adds me to CODEOWNERS of the package. commit 71a2e703a9de3afc450b4ffcf54064ba21cc0f4d Author: Tarrin Neal <[email protected]> Date: Wed Dec 4 19:32:11 2024 -0800 [pigeon] adds event channel support for kotlin and swift (#7892) adds event channel support for kotlin and swift work towards https://github.com/flutter/flutter/issues/66711 adds sealed classes with extensions (empty base classes only) fixes https://github.com/flutter/flutter/issues/155859 (Fix a small inconsistency with Pigeon docs) adds some convenience methods to Root fixes generation/format tests to include test pigeons Makes swift codec class names upper camel case commit ea902186e4db7b1c91372d0b87914a74a5e68e3d Author: Vitaly Sokolov <[email protected]> Date: Thu Dec 5 01:08:10 2024 +0200 [google_adsense] (Experimental) AdSense plugin for Flutter Web (#6871) Google Adsense plugin should allow Flutter Web developers to integrate Adsense more easily and monetize web project. *List which issues are fixed by this PR. You must list at least one issue.* https://github.com/flutter/flutter/issues/40376 commit 71c9e77b68367fc6d493a2d0c3a827539a31bb1f Author: Loïc Sharma <[email protected]> Date: Wed Dec 4 14:25:08 2024 -0800 [various] Add Swift Package Manager integration to image picker examp… (#8227) This migrates the following plugins' example apps to have Swift Package Manager integration: 1. image_picker 2. image_picker_ios 3. image_picker_macos This also checks-in CocoaPods integration stuff that was missing. This raises the example apps' Flutter SDK requirement to 3.24.0 or higher. I will get a text exemption for this change. The example apps were migrated using the following commands: ``` dart run script/tool/bin/flutter_plugin_tools.dart build-examples --ios --swift-package-manager dart run script/tool/bin/flutter_plugin_tools.dart build-examples --macos --swift-package-manager ``` Part of: https://github.com/flutter/flutter/issues/159173 commit 012fae8f1dd6930d776aa602df9de8343dc25e76 Author: Loïc Sharma <[email protected]> Date: Wed Dec 4 14:23:11 2024 -0800 [pigeon] Add Swift Package Manager integration to example app (#8225) This migrates Pigeon's example app to have Swift Package Manager integration. This raises the example apps' Flutter SDK requirement to 3.24.0 or higher. This also checks-in CocoaPods integration stuff that was missing. I will get a text exemption for this change. The example apps were migrated using the following commands: ``` dart run script/tool/bin/flutter_plugin_tools.dart build-examples --ios --swift-package-manager dart run script/tool/bin/flutter_plugin_tools.dart build-examples --macos --swift-package-manager ``` Part of: https://github.com/flutter/flutter/issues/159173 commit d34f32dfaa6ac2e0af22208e1d1116d38ba47235 Author: Paweł Jakubowski <[email protected]> Date: Wed Dec 4 22:07:24 2024 +0100 [video_player_avfoundation] Split iOS native code into multiple files (#8171) This PR splits iOS native code into multiple files. Specifically, it extracts `FVPVideoPlayer` and `FVPFrameUpdater` from `FVPVideoPlayerPlugin.m` file, and puts them into separate files (.h and .m). This should make it easier to maintain the code and add new features in the future (e.g. support for platform views which is mentioned in [86613](https://github.com/flutter/flutter/issues/86613). In order for the code to compile, I had to add some methods to the interface of `FVPVideoPlayer`. I also added doc comments for them. No tests were added as this PR does not introduce any new functionality. Related issues: - [86613](https://github.com/flutter/flutter/issues/86613) This PR does not fix the issue, it only refactors some parts of the code, so that it is easier in the future to add support for platform views (the git diff will be cleaner when we modify the code to support it - only related changes would show up then). If you'd like me to create a new issue, specifically for splitting the native code into files, let me know. commit 264d920a4ce617436eeee46a8f5fa35d971f39c1 Author: engine-flutter-autoroll <[email protected]> Date: Wed Dec 4 14:17:07 2024 -0500 Roll Flutter from e64ee5de7cdd to e1e4ee9a016e (18 revisions) (#8224) https://github.com/flutter/flutter/compare/e64ee5de7cdd...e1e4ee9a016e 2024-12-04 [email protected] Fix `DropdownMenu` focus (flutter/flutter#156412) 2024-12-04 [email protected] Add deprecation notice for Android x86 when building for the target (flutter/flutter#159750) 2024-12-04 [email protected] Marks Mac_benchmark flutter_view_macos__start_up to be flaky (flutter/flutter#159541) 2024-12-04 [email protected] Reland Fix InkWell overlayColor resolution ignores selected state (flutter/flutter#159784) 2024-12-04 [email protected] Roll Flutter Engine from ee1b6ed65677 to 29d66405e6df (2 revisions) (flutter/flutter#159783) 2024-12-04 [email protected] Roll Flutter Engine from 1e6864c489c8 to ee1b6ed65677 (1 revision) (flutter/flutter#159778) 2024-12-04 [email protected] Format controller.dart of flutter_test (flutter/flutter#159667) 2024-12-04 [email protected] Add `mouseCursor` parameter to `Chip`s (flutter/flutter#159422) 2024-12-04 [email protected] Roll Flutter Engine from 938f8163b526 to 1e6864c489c8 (6 revisions) (flutter/flutter#159776) 2024-12-03 [email protected] Increase timeout of Devtools tests (flutter/flutter#159759) 2024-12-03 [email protected] Add `IconAlignment` to `ButtonStyle` and `styleFrom` methods (flutter/flutter#158503) 2024-12-03 [email protected] [Widget Inspector] Only include `truncated` field in JSON response if `true` (flutter/flutter#159701) 2024-12-03 [email protected] fix fialing lint `Consider using 'register' to avoid unnecessary configuration` (flutter/flutter#159137) 2024-12-03 [email protected] Fix typo in flutter_command.dart (flutter/flutter#159398) 2024-12-03 [email protected] Mark Mac_ios microbenchmarks_ios as flakey (flutter/flutter#158540) 2024-12-03 [email protected] Roll Flutter Engine from c7f553eb6a30 to 938f8163b526 (1 revision) (flutter/flutter#159742) 2024-12-03 [email protected] remove unnecessary semicolon in module_plugin_loader.radle (flutter/flutter#159303) 2024-12-03 [email protected] [SwiftPM] Rename `SWIFT_PACKAGE_MANAGER` environment variable to `FLUTTER_SWIFT_PACKAGE_MANAGER` (flutter/flutter#159502) 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] 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: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md commit bd8dafac67c2dd30abc648cbec375937099209c0 Author: Loïc Sharma <[email protected]> Date: Wed Dec 4 10:37:15 2024 -0800 [various] Add Swift Package Manager integration to example apps (#8219) This migrates various example apps to have Swift Package Manager integration. This raises the example apps' Flutter SDK requirement to 3.24.0 or higher. I will get a text exemption for this change. The example apps were migrated using the following commands: ``` dart run script/tool/bin/flutter_plugin_tools.dart build-examples --ios --swift-package-manager dart run script/tool/bin/flutter_plugin_tools.dart build-examples --macos --swift-package-manager ``` â� ï¸� The following plugins' example apps are **not* included in this change as their migration included non-SPM changes that require closer review: 1. google_sign_in 1. google_sign_in_ios 1. image_picker 1. image_picker_ios 1. image_picker_macos 1. pigeon Part of: https://github.com/flutter/flutter/issues/159173 commit 67291a378c270ba61641406c1991c0f432600307 Author: stuartmorgan <[email protected]> Date: Wed Dec 4 10:38:57 2024 -0500 [google_maps_flutter] Annotate deprecated member usage (#8214) There are several intentional uses of deprecated members from other packages within the plugin group, so annotate them so that they don't show up in the regular team audits: - App-facing package integration tests of the deprecated style method. - Handling of deprecated marker bitmap formats. These turned up in the [routine repo audit](https://github.com/flutter/flutter/blob/main/docs/infra/Packages-Gardener-Rotation.md#deprecations). commit 74963062fb0bb244dbc4cfd1036432a132d20fb2 Author: Maurice Parrish <[email protected]> Date: Tue Dec 3 21:28:51 2024 -0700 [pigeon] Fixes channel names of the named constructors of ProxyApis. (#8201) commit 28160caa64eaaebd300dd494720a5b1e1afd0d9c Author: stuartmorgan <[email protected]> Date: Tue Dec 3 17:01:21 2024 -0500 [local_auth] Add compatibility with intl 0.20 (#8217) Nothing in `intl` 0.20 breaks `local_auth` usage, so expand the compatibility window to include 0.20.x for better ecosystem compatibility. Fixes https://github.com/flutter/flutter/issues/159591 commit d44156691131583f6cddf47d23655a3471ff2634 Author: stuartmorgan <[email protected]> Date: Tue Dec 3 13:52:21 2024 -0500 [various] Replaces deprecated `whereNotNull()` (#8215) Replaces the `whereNotNull()` method from `pkg:collection` with the Dart core `nonNulls`. `nonNulls` has been available in Dart since 3.0, so no dependency or SDK requirement changes are necessary. Fixes https://github.com/flutter/flutter/issues/159738 commit bf4194590e460405a948aa39cd714e03c88ae718 Author: engine-flutter-autoroll <[email protected]> Date: Tue Dec 3 12:00:18 2024 -0500 Roll Flutter from 08e26a3ffcd7 to e64ee5de7cdd (20 revisions) (#8213) https://github.com/flutter/flutter/compare/08e26a3ffcd7...e64ee5de7cdd 2024-12-03 [email protected] Roll Flutter Engine from f9d4f744e088 to c7f553eb6a30 (1 revision) (flutter/flutter#159722) 2024-12-03 [email protected] Make native asset tests more robust against flutter upgrading its pinned dependencies (flutter/flutter#159715) 2024-12-03 [email protected] Roll Flutter Engine from 089071a726d5 to f9d4f744e088 (1 revision) (flutter/flutter#159713) 2024-12-03 [email protected] Fix DropdownMenu menu is detached from the text field (flutter/flutter#159665) 2024-12-03 [email protected] Roll Flutter Engine from 349ad277b574 to 089071a726d5 (1 revision) (flutter/flutter#159708) 2024-12-03 [email protected] Roll Flutter Engine from 5001e2a490db to 349ad277b574 (4 revisions) (flutter/flutter#159706) 2024-12-03 [email protected] Roll Flutter Engine from 05fdaa6edc12 to 5001e2a490db (6 revisions) (flutter/flutter#159702) 2024-12-02 [email protected] Marks Linux build_tests_4_5 to be unflaky (flutter/flutter#154994) 2024-12-02 [email protected] doc/improve-hint-text-doc (flutter/flutter#156313) 2024-12-02 [email protected] Ignore exhaustiveness check for some semantics tests, for now (flutter/flutter#159517) 2024-12-02 [email protected] Roll Flutter Engine from e0900f83a0c8 to 05fdaa6edc12 (9 revisions) (flutter/flutter#159694) 2024-12-02 [email protected] Fix output path for --appSizeBase (flutter/flutter#158302) 2024-12-02 [email protected] [ Tool ] Fix "Error: Unable to find git in your PATH" when Command Processor `AutoRun` registry key is defined (flutter/flutter#159424) 2024-12-02 [email protected] [tool] Removes deprecated --web-renderer parameter. (flutter/flutter#159314) 2024-12-02 [email protected] Roll Flutter Engine from 1f6312df6d75 to e0900f83a0c8 (3 revisions) (flutter/flutter#159684) 2024-12-02 [email protected] iPad Scribble flicker and crash (flutter/flutter#159508) 2024-12-02 [email protected] Roll Flutter Engine from d7be573a5ee5 to 1f6312df6d75 (1 revision) (flutter/flutter#159676) 2024-11-29 [email protected] improve `ContainerRenderObjectMixin` error message when `parentData` is not set up properly (flutter/flutter#157846) 2024-11-28 [email protected] Roll Flutter Engine from d7c0bcfe7a30 to d7be573a5ee5 (1 revision) (flutter/flutter#159595) 2024-11-28 [email protected] Roll Packages from e6932b77a183 to bc0c22d57910 (2 revisions) (flutter/flutter#159592) 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] 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: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md commit 15501ece235684a3bdddad089345fc3e33dc1df3 Author: stuartmorgan <[email protected]> Date: Mon Dec 2 14:32:19 2024 -0500 [shared_preferences] Limit Android decoding (#8187) When decoding stored preferences for `List<String>` support, only allow lists and strings to avoid potentially instantiating other object types. commit a4ac811b752571de0764b07c83031807ed9bd647 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Dec 2 17:14:48 2024 +0000 [camera_android]: Bump androidx.annotation:annotation from 1.9.0 to 1.9.1 in /packages/camera/camera_android/android (#8164) Bumps androidx.annotation:annotation from 1.9.0 to 1.9.1. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=androidx.annotation:annotation&package-manager=gradle&previous-version=1.9.0&new-version=1.9.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> commit 6c7a61d1fc30e28edd7851ce6c558fafa0f82603 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Dec 2 09:59:24 2024 +0000 [gradle]: Bump org.jetbrains.kotlin:kotlin-gradle-plugin from 2.0.21 to 2.1.0 in /packages/pigeon/platform_tests/test_plugin/android (#8205) Bumps [org.jetbrains.kotlin:kotlin-gradle-plugin](https://github.com/JetBrains/kotlin) from 2.0.21 to 2.1.0. <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/JetBrains/kotlin/releases">org.jetbrains.kotlin:kotlin-gradle-plugin's releases</a>.</em></p> <blockquote> <h2>Kotlin 2.1.0</h2> <h2>Changelog</h2> <h3>Analysis API</h3> <h4>New Features</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-68603"><code>KT-68603</code></a> KotlinDirectInheritorsProvider: add an option to ignore non-kotlin results</li> </ul> <h4>Performance Improvements</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-70757"><code>KT-70757</code></a> Performance problem in KaFirVisibilityChecker for KaFirPsiJavaClassSymbol</li> </ul> <h4>Fixes</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-70437"><code>KT-70437</code></a> Class reference is not resolvable</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-57733"><code>KT-57733</code></a> Analysis API: Use optimized <code>ModuleWithDependenciesScope</code>s in combined symbol providers</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-72389"><code>KT-72389</code></a> K2: False positive &quot;Redundant 'protected' modifier&quot; for protected property inside protected constructor from private or internal class</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69190"><code>KT-69190</code></a> K2: False-positive &quot;redundant private modifier&quot;</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-64984"><code>KT-64984</code></a> Analysis API: Support Wasm target</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70375"><code>KT-70375</code></a> K2: NPE at org.jetbrains.kotlin.analysis.api.fir.symbols.KaFirNamedClassSymbolBase.createPointer</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-71259"><code>KT-71259</code></a> K2 evaluator: Invalid smart cast info collecting for Code Fragments</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69360"><code>KT-69360</code></a> Lack of implicit receiver for the last statement under lambda in scripts</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70890"><code>KT-70890</code></a> Analysis API: Experiment with weak references to LL FIR/analysis sessions in session caches</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70657"><code>KT-70657</code></a> Analysis API: Inner types from classes with generics are incorrectly represented by the compiled jars</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-71055"><code>KT-71055</code></a> Suspend calls inside 'analyze()' break the block guarantees</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70815"><code>KT-70815</code></a> Analysis API: Implement stop-the-world session invalidation</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69819"><code>KT-69819</code></a> K2 IDE: LHS type in callable references is unresolved when it has type arguments and is qualified</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68761"><code>KT-68761</code></a> Analysis API: Experiment with limited-size cache in <code>KaFirSessionProvider</code></li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70384"><code>KT-70384</code></a> Analysis API Standalone: The same class in the same two renamed jars is unresolved</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-71067"><code>KT-71067</code></a> Exceptions from references cancel Find Usages</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69535"><code>KT-69535</code></a> Redesign 'containingSymbol'</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-71025"><code>KT-71025</code></a> K2 IDE: Scopes in &quot;importingScopeContext&quot; have reversed ordering and &quot;indexInTower&quot; values</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-67483"><code>KT-67483</code></a> K2 IDE: Serializable plugin causes infinite resolve recursion when there is a star import from a class with annotation call</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69416"><code>KT-69416</code></a> K2 IDE / Completion: â��No classifier foundâ�� on simple value creating</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70257"><code>KT-70257</code></a> CCE: class kotlin.UInt cannot be cast to class java.lang.Number</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70376"><code>KT-70376</code></a> K2 IDE / Kotlin Debugger: IAE â��Only componentN functions should be cached this way, but got: toStringâ�� on evaluating toString() method for value class</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70264"><code>KT-70264</code></a> AA: service registration via XML fails with AbstractMethodError in Lint CLI</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69950"><code>KT-69950</code></a> Analysis API: Introduce <code>isSubtypeOf(ClassId)</code></li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68625"><code>KT-68625</code></a> K2: â��<code>lazyResolveToPhase(STATUS)</code> cannot be called from a transformer with a phase STATUS.â��</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-67665"><code>KT-67665</code></a> K2: contract violation for value class with a constructor parameter with an implicit type</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-67009"><code>KT-67009</code></a> Analysis API: Add abbreviated type tests for type aliases from source modules</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69977"><code>KT-69977</code></a> KaFirFunctionalType#getAbbreviation is always null</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68341"><code>KT-68341</code></a> Analysis API: Expanded function types from libraries don't have an abbreviated type</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68857"><code>KT-68857</code></a> Analysis API: Refactor annotations</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70386"><code>KT-70386</code></a> Do not filter out overloads from different libraries in dangling files</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-65552"><code>KT-65552</code></a> K2: CANNOT_CHECK_FOR_ERASED in KtTypeCodeFragment</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-65803"><code>KT-65803</code></a> K2: Analysis API: KtFirTypeProvider#getSubstitutedSuperTypes throws an exception in the case of &quot;Wrong number of type arguments&quot;</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68896"><code>KT-68896</code></a> Support VirtualFile binary dependency inputs to Analysis API modules</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69395"><code>KT-69395</code></a> K2 IDE: incorrect overload selection from binary dependencies in a shared native source set</li> </ul> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Changelog</summary> <p><em>Sourced from <a href="https://github.com/JetBrains/kotlin/blob/master/ChangeLog.md">org.jetbrains.kotlin:kotlin-gradle-plugin's changelog</a>.</em></p> <blockquote> <h2>2.1.0</h2> <h3>Analysis API</h3> <h4>New Features</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-68603"><code>KT-68603</code></a> KotlinDirectInheritorsProvider: add an option to ignore non-kotlin results</li> </ul> <h4>Performance Improvements</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-70757"><code>KT-70757</code></a> Performance problem in KaFirVisibilityChecker for KaFirPsiJavaClassSymbol</li> </ul> <h4>Fixes</h4> <ul> <li><a href="https://youtrack.jetbrains.com/issue/KT-70437"><code>KT-70437</code></a> Class reference is not resolvable</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-57733"><code>KT-57733</code></a> Analysis API: Use optimized <code>ModuleWithDependenciesScope</code>s in combined symbol providers</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-72389"><code>KT-72389</code></a> K2: False positive &quot;Redundant 'protected' modifier&quot; for protected property inside protected constructor from private or internal class</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69190"><code>KT-69190</code></a> K2: False-positive &quot;redundant private modifier&quot;</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-64984"><code>KT-64984</code></a> Analysis API: Support Wasm target</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70375"><code>KT-70375</code></a> K2: NPE at org.jetbrains.kotlin.analysis.api.fir.symbols.KaFirNamedClassSymbolBase.createPointer</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-71259"><code>KT-71259</code></a> K2 evaluator: Invalid smart cast info collecting for Code Fragments</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69360"><code>KT-69360</code></a> Lack of implicit receiver for the last statement under lambda in scripts</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70890"><code>KT-70890</code></a> Analysis API: Experiment with weak references to LL FIR/analysis sessions in session caches</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70657"><code>KT-70657</code></a> Analysis API: Inner types from classes with generics are incorrectly represented by the compiled jars</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-71055"><code>KT-71055</code></a> Suspend calls inside 'analyze()' break the block guarantees</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70815"><code>KT-70815</code></a> Analysis API: Implement stop-the-world session invalidation</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69819"><code>KT-69819</code></a> K2 IDE: LHS type in callable references is unresolved when it has type arguments and is qualified</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68761"><code>KT-68761</code></a> Analysis API: Experiment with limited-size cache in <code>KaFirSessionProvider</code></li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70384"><code>KT-70384</code></a> Analysis API Standalone: The same class in the same two renamed jars is unresolved</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-71067"><code>KT-71067</code></a> Exceptions from references cancel Find Usages</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69535"><code>KT-69535</code></a> Redesign 'containingSymbol'</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-71025"><code>KT-71025</code></a> K2 IDE: Scopes in &quot;importingScopeContext&quot; have reversed ordering and &quot;indexInTower&quot; values</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-67483"><code>KT-67483</code></a> K2 IDE: Serializable plugin causes infinite resolve recursion when there is a star import from a class with annotation call</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69416"><code>KT-69416</code></a> K2 IDE / Completion: â��No classifier foundâ�� on simple value creating</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70257"><code>KT-70257</code></a> CCE: class kotlin.UInt cannot be cast to class java.lang.Number</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70376"><code>KT-70376</code></a> K2 IDE / Kotlin Debugger: IAE â��Only componentN functions should be cached this way, but got: toStringâ�� on evaluating toString() method for value class</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70264"><code>KT-70264</code></a> AA: service registration via XML fails with AbstractMethodError in Lint CLI</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69950"><code>KT-69950</code></a> Analysis API: Introduce <code>isSubtypeOf(ClassId)</code></li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68625"><code>KT-68625</code></a> K2: â��<code>lazyResolveToPhase(STATUS)</code> cannot be called from a transformer with a phase STATUS.â��</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-67665"><code>KT-67665</code></a> K2: contract violation for value class with a constructor parameter with an implicit type</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-67009"><code>KT-67009</code></a> Analysis API: Add abbreviated type tests for type aliases from source modules</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69977"><code>KT-69977</code></a> KaFirFunctionalType#getAbbreviation is always null</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68341"><code>KT-68341</code></a> Analysis API: Expanded function types from libraries don't have an abbreviated type</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68857"><code>KT-68857</code></a> Analysis API: Refactor annotations</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-70386"><code>KT-70386</code></a> Do not filter out overloads from different libraries in dangling files</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-65552"><code>KT-65552</code></a> K2: CANNOT_CHECK_FOR_ERASED in KtTypeCodeFragment</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-65803"><code>KT-65803</code></a> K2: Analysis API: KtFirTypeProvider#getSubstitutedSuperTypes throws an exception in the case of &quot;Wrong number of type arguments&quot;</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68896"><code>KT-68896</code></a> Support VirtualFile binary dependency inputs to Analysis API modules</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-69395"><code>KT-69395</code></a> K2 IDE: incorrect overload selection from binary dependencies in a shared native source set</li> <li><a href="https://youtrack.jetbrains.com/issue/KT-68573"><code>KT-68573</code></a> ISE: &quot;Unexpected constant value (kotlin/annotation/AnnotationTarget, CLASS)&quot; at Kt1DescUtilsKt.toKtConstantValue()</li> </ul> </blockquote> <p>... (truncated)</p> </details> <details> <summary>Commits</summary> <ul> <li><a href="https://github.com/JetBrains/kotlin/commit/5dd9cea66ee526f0251c9b1d2543229202622f6b"><code>5dd9cea</code></a> Add ChangeLog for 2.1.0</li> <li><a href="https://github.com/JetBrains/kotlin/commit/be31f19145a096198df5f371118961f202126eb0"><code>be31f19</code></a> [Gradle] Fix documentation publishing to Kotlinlang</li> <li><a href="https://github.com/JetBrains/kotlin/commit/f959bf2dd9a5f02b66fb339e8e659bc2590a9aa7"><code>f959bf2</code></a> Add ChangeLog for 2.1.0-RC2</li> <li><a href="https://github.com/JetBrains/kotlin/commit/b21df7b4e9852022aae95cdd4f922c3df809adf5"><code>b21df7b</code></a> [Gradle] Update info about versioning</li> <li><a href="https://github.com/JetBrains/kotlin/commit/a7dabb638d59fc4ac7ba5aaa6bfed99022d02fa6"><code>a7dabb6</code></a> [Gradle] Fix templates extraction</li> <li><a href="https://github.com/JetBrains/kotlin/commit/858b9147b4c89ce9dc9521df57f4b3395729b867"><code>858b914</code></a> [Gradle] Add KDoc for KotlinTargetsDsl</li> <li><a href="https://github.com/JetBrains/kotlin/commit/1026b47e1c6fa8e7728c61ae9533cebb5300250a"><code>1026b47</code></a> [Gradle] Add KDoc for KotlinTargetWithTests</li> <li><a href="https://github.com/JetBrains/kotlin/commit/54452c021e4eb52fc06c30ce6ad95e8598b186c0"><code>54452c0</code></a> [Gradle] Add KDoc for KotlinTestRun</li> <li><a href="https://github.com/JetBrains/kotlin/commit/d10e47ad6f4deffb66571a427051d870336f5b45"><code>d10e47a</code></a> [Gradle] Add KDoc for KotlinExecution</li> <li><a href="https://github.com/JetBrains/kotlin/commit/1208eec9269efc6ccf1924664c9f3e383a35fb7e"><code>1208eec</code></a> fix: clarifications and language polishing</li> <li>Additional commits viewable in <a href="https://github.com/JetBrains/kotlin/compare/v2.0.21...v2.1.0">compare view</a></li> </ul> </details> <br /> [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=org.jetbrains.kotlin:kotlin-gradle-plugin&package-manager=gradle&previous-version=2.0.21&new-version=2.1.0)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> commit 3458b423386e9cb0a0f421b98996bd5b91c7820f Author: engine-flutter-autoroll <[email protected]> Date: Thu Nov 28 10:52:29 2024 -0500 Roll Flutter from fae695ed6198 to 08e26a3ffcd7 (19 revisions) (#8197) https://github.com/flutter/flutter/compare/fae695ed6198...08e26a3ffcd7 2024-11-28 [email protected] Revert "Fix InkWell overlayColor resolution ignores selected state (#159072) (flutter/flutter#159589) 2024-11-28 [email protected] Revert "Fix Date picker overlay colors aren't applied on selected staâ�¦ (flutter/flutter#159583) 2024-11-28 [email protected] Roll Flutter Engine from dd0ef5ba7d9a to d7c0bcfe7a30 (1 revision) (flutter/flutter#159579) 2024-11-28 [email protected] Roll Flutter Engine from ba112add5d98 to dd0ef5ba7d9a (2 revisions) (flutter/flutter#159574) 2024-11-28 [email protected] [web] On the web platform, use an <img> tag to show an image if it can't be accessed with CORS (flutter/flutter#157755) 2024-11-28 [email protected] Fix: Announce only the first error message for better accessibility (flutter/flutter#156399) 2024-11-27 [email protected] Roll Flutter Engine from ed4e13cefb45 to ba112add5d98 (1 revision) (flutter/flutter#159563) 2024-11-27 [email protected] Roll Packages from 8ecf4b010143 to e6932b77a183 (3 revisions) (flutter/flutter#159561) 2024-11-27 [email protected] Roll Flutter Engine from 4121287c360a to ed4e13cefb45 (1 revision) (flutter/flutter#159559) 2024-11-27 [email protected] Marks Mac_benchmark hello_world_macos__compile to be flaky (flutter/flutter#159543) 2024-11-27 [email protected] [native assets] Create `NativeAssetsManifest.json` instead of kernel embedding (flutter/flutter#159322) 2024-11-27 [email protected] Roll Flutter Engine from b9474a99694c to 4121287c360a (1 revision) (flutter/flutter#159530) 2024-11-27 [email protected] Roll Flutter Engine from da71729651d8 to b9474a99694c (2 revisions) (flutter/flutter#159527) 2024-11-27 [email protected] Roll Flutter Engine from bd165dc27166 to da71729651d8 (7 revisions) (flutter/flutter#159523) 2024-11-27 [email protected] Reland CupertinoPopupSurface (flutter/flutter#159272) 2024-11-26 [email protected] Suppress previous route transition if current route is fullscreenDialog (flutter/flutter#159312) 2024-11-26 [email protected] Roll Flutter Engine from fe45a6608651 to bd165dc27166 (23 revisions) (flutter/flutter#159504) 2024-11-26 [email protected] [Widget Inspector] Fix stack overflow error for Flutter web when requesting a large widget tree (flutter/flutter#159454) 2024-11-26 [email protected] Report usage of `deferred-components` to analytics. (flutter/flutter#159307) 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: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md commit bc0c22d57910047fff7569ccb4413cf031304c7d Author: Gray Mackall <[email protected]> Date: Wed Nov 27 14:12:22 2024 -0800 [image_picker_android] Refactor interactions with ContentProvider provided filenames (#8188) https://developer.android.com/privacy-and-security/risks/untrustworthy-contentprovider-provided-filename#don%27t-trust-user-input Adapted from this option https://developer.android.com/privacy-and-security/risks/untrustworthy-contentprovider-provided-filename#sanitize-provided-filenames Based on the PR for `file_selector_android` https://github.com/flutter/packages/pull/8184. commit f7667a655bc603fa996c9b4a4c8f7f525d52eef7 Author: Gray Mackall <[email protected]> Date: Wed Nov 27 13:29:15 2024 -0800 [file_selector_android] Refactor interactions with `ContentProvider` provided filenames (#8184) https://developer.android.com/privacy-and-security/risks/untrustworthy-contentprovider-provided-filename#don%27t-trust-user-input Adapted from this option https://developer.android.com/privacy-and-security/risks/untrustworthy-contentprovider-provided-filename#sanitize-provided-filenames commit e6932b77a183661e19136993094c3cc268900562 Author: stuartmorgan <[email protected]> Date: Tue Nov 26 16:28:07 2024 -0500 [flutter_svg] Adopt code excerpts (#8181) Converts the README from unmanaged code examples to code excerpted from analyzed and compiled code. Part of https://github.com/flutter/flutter/issues/102679 commit 20331195daf4673832420726c7085d800a1641aa Author: Navaron Bracke <[email protected]> Date: Tue Nov 26 22:02:06 2024 +0100 [flutter_markdown] fix invalid URI's causing unhandled image errors (#8058) This PR adds an error builder for images, so that any errors from those are caught. *List which issues are fixed by this PR. You must list at least one issue.* Fixes https://github.com/flutter/flutter/issues/158428 commit e9a6e246ffb4c433f8587e27b4d9050ca56c4676 Author: Maurice Parrish <[email protected]> Date: Tue Nov 26 13:42:31 2024 -0700 [ci][webview_flutter_android] Manual Roll and skip tests (#8186) Manual Roll and skip failing `webview_flutter_android` test. See https://github.com/flutter/flutter/issues/159500 commit 8ecf4b010143d331461aa466f371a4f6f7f58d83 Author: stuartmorgan <[email protected]> Date: Mon Nov 25 19:31:07 2024 -0500 [file_selector] Update Pigeon version for Linux (#8172) Updates to the latest version of Pigeon, picking up the change to make the declarations of some classes public rather than in the implementation file. Fixes https://github.com/flutter/flutter/issues/158900 commit e2e55cf72e6827da6b72c402e158adb02a5152e2 Author: Loïc Sharma <[email protected]> Date: Mon Nov 25 11:49:14 2024 -0800 [various] Migrate example apps' AppDelegate.swift (#8155) Migrated by running: ``` dart run script/tool/bin/flutter_plugin_tools.dart build-examples --ios --swift-package-manager dart run script/tool/bin/flutter_plugin_tools.dart build-examples --macos --swift-package-manager ``` Tests aren't updated as this change should not affect semantics. I will get a test exemption. Part of https://github.com/flutter/flutter/issues/159173 commit d91f1389716bc7185f5535817185822d3ffd5d30 Author: Loïc Sharma <[email protected]> Date: Mon Nov 25 11:11:39 2024 -0800 [various] Update example apps' .gitignore (#8156) Migrated by running: ``` dart run script/tool/bin/flutter_plugin_tools.dart build-examples --ios --swift-package-manager dart run script/tool/bin/flutter_plugin_tools.dart build-examples --macos --swift-package-manager ``` No test changes as this is a configuration change. I will get a test exemption. Part of https://github.com/flutter/flutter/issues/159173 commit e78838ec1c299e5f8f2f61301685d2e7efa5dc52 Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon Nov 25 18:20:04 2024 +0000 [gradle]: Bump androidx.annotation:annotation from 1.9.0 to 1.9.1 in /packages/path_provider/path_provider_android/android (#8170) Bumps androidx.annotation:annotation from 1.9.0 to 1.9.1. [![Dependabot compatibility score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=androidx.annotation:annotation&package-manager=gradle&previous-version=1.9.0&new-version=1.9.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores) Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself) </details> commit bc18995a266edbe0f3d1c2dad7111091e488130e Author: Fransdhinta D. Prianggoro <[email protected]> Date: Mon Nov 25 22:39:07 2024 +0700 [vector_graphics_compiler] fix: handle parsing stroke-width with an invalid value (#8004) There is some issue while calling parseDouble from the original repo of this package [issue link](https://github.com/dnfield/vector_graphics/issues/209#issue-1784058965). I suggest a fix to change the return of **parseDouble** to always double.tryParse so that it will return `null` instead of throwing an error if it parses an invalid String Fixes https://github.com/flutter/flutter/issues/158819 Issue: [link](https://github.com/dnfield/vector_graphics/issues/209#issue-1784058965) commit 46aeb2b29d60d3b0492b716baaeed4c803890078 Author: Reid Baker <[email protected]> Date: Fri Nov 22 18:53:19 2024 -0500 Update avd_cipd_version (#8135) Aligns with framework https://github.com/flutter/flutter/pull/158017/ and Engine https://github.com/flutter/engine/pull/56313 Related to b/371020223 commit 0be7cbe2517471e57a9d989daf27d725dfb46048 Author: Maurice Parrish <[email protected]> Date: Fri Nov 22 14:10:01 2024 -0700 [interactive_media_ads] Adds internal wrapper for Android native `CompanionAdSlot` and `CompanionAdSlot.ClickListener` (#8131) commit 35f9c6e894a24a452d88472fc6fd9ff88d61cfec Author: engine-flutter-autoroll <[email protected]> Date: Fri Nov 22 13:30:00 2024 -0500 Roll Flutter from 93d772c5cdd8 to 793569f621f7 (5 revisions) (#8152) https://github.com/flutter/flutter/compare/93d772c5cdd8...793569f621f7 2024-11-22 [email protected] Add `columnWidth` Property to `DataTable` for Customizable Column Widths (flutter/flutter#159279) 2024-11-22 [email protected] Roll Flutter Engine from d1a08064e193 to 6f941c961b05 (5 revisions) (flutter/flutter#159308) 2024-11-22 [email protected] Move Linux packages_autoroller to bringup (flutter/flutter#159336) 2024-11-21 [email protected] Fix `--web-header` flag for `flutter drive` (flutter/flutter#159039) 2024-11-21 [email protected] Do a clean shutdown of the flutter_tools processes started by observatory_port_test (flutter/flutter#159169) 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: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md commit 920321356e4507f1471bb00413d84b846a3c2697 Author: Loïc Sharma <[email protected]> Date: Fri Nov 22 08:42:53 2024 -0800 Reland "[url_launcher] Add Swift Package Manager integration to example app" (#8148) Relands https://github.com/flutter/packages/pull/8128 which had been reverted due to license check errors (see https://github.com/flutter/packages/pull/8137). ### Original PR description This migrates the example app to have Swift Package Manager integration. This raises the example app's Flutter SDK requirement to 3.24.0 or higher. Scenarios: 1. **Run the example app using Flutter 3.24 or higher with SwiftPM feature on**: Plugin is added using Swift Package Manager. 2. **Run the example app using Flutter 3.24 or higher with SwiftPM feature off**: Plugin is added using CocoaPods. The tool generates an empty `FlutterGeneratedPluginSwiftPackage` local package. 3. **Run the example app using Flutter version lower than 3.24**: you get a build error because the example app's Xcode project expects a `FlutterGeneratedPluginSwiftPackage` local package but cannot find it. Part of: https://github.com/flutter/flutter/issues/159173 ### Tests Current tests build the example apps twice: once with SwiftPM on, once with SwiftPM off. Currently, the tests with SwiftPM on also migrate the example app to add SwiftPM integration. After this change, these tests will no longer need to migrate the example app as it is already migrated. In other words, this change is covered by existing tests. ### Migration steps The app was migrated using these steps: ```console flutter channel master flutter upgrade flutter config --enable-swift-package-manager flutter build ios --config-only flutter build macos --config-only ``` commit 14a822fc38781b8eb8499e54311edc689913a6ab Author: Meliksah Cakir <[email protected]> Date: Fri Nov 22 17:42:50 2024 +0100 [webview_flutter_wkwebview] Webkit webview controller multiple registration fix (#8078) Fixes re-registering existing channels while removing Javascript channels in iOS environment. Android works as expected. Fixes https://github.com/flutter/flutter/issues/158648 commit 761812665448c7e5a1bd5810aeabfac1ac027038 Author: Sinyu <[email protected]> Date: Fri Nov 22 10:24:07 2024 +0800 [quick_actions_plaform_interface] add localizedSubtitle (#8112) This is prequel PR for: https://github.com/flutter/packages/pull/8038 Containing only changes to quick_action_platform_interface package. Add the localizedSubtitle field on quick actions for iOS https://github.com/flutter/flutter/issues/129759 commit fb8a5e17d134168b867abf4407e871db0306a183 Author: Loïc Sharma <[email protected]> Date: Thu Nov 21 18:00:23 2024 -0800 [tools] Don't check license of generated Swift package (#8137) This updates the license check to ignore any file contained in a `FlutterGeneratedPluginSwiftPackage` directory. https://github.com/flutter/packages/pull/8128 was reverted as it caused the license check to [fail](https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8730732827684094689/+/u/Run_package_tests/license_validation/stdout): ``` The license block for these files is missing or incorrect: /b/s/w/ir/x/w/packages/packages/url_launcher/url_launcher/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift /b/s/w/ir/x/w/packages/packages/url_launcher/url_launcher/example/ios/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift /b/s/w/ir/x/w/packages/packages/url_launcher/url_launcher/example/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Package.swift /b/s/w/ir/x/w/packages/packages/url_launcher/url_launcher/example/macos/Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage/Sources/FlutterGeneratedPluginSwiftPackage/FlutterGeneratedPluginSwiftPackage.swift If this third-party code, move it to a "third_party/" directory, otherwise ensure that you are using the exact copyright and license text used by all first-party files in this repository. ``` Part of https://github.com/flutter/flutter/issues/159173 commit 0dac30a24e6689cff8c5f4b8675d9837ffb0aff3 Author: engine-flutter-autoroll <[email protected]> Date: Thu Nov 21 18:55:14 2024 -0500 Roll Flutter from 8536b96ebb3e to 93d772c5cdd8 (37 revisions) (#8147) Roll Flutter from 8536b96ebb3e to 93d772c5cdd8 (37 revisions) https://github.com/flutter/flutter/compare/8536b96ebb3e...93d772c5cdd8 2024-11-21 [email protected] Added additional logging to `_listCoreDevices` (flutter/flutter#159275) 2024-11-21 [email protected] Roll Flutter Engine from 78b87f3fe023 t…
1 parent 1fb6122 commit 20189e5

File tree

10 files changed

+326
-35
lines changed

10 files changed

+326
-35
lines changed

‎packages/google_adsense/example/integration_test/adsense_test_js_interop.dart‎

Lines changed: 90 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,90 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
@JS()
6+
library;
7+
8+
import 'dart:async';
9+
import 'dart:js_interop';
10+
import 'dart:ui';
11+
12+
import 'package:google_adsense/src/adsense/ad_unit_params.dart';
13+
import 'package:web/web.dart' as web;
14+
15+
typedef VoidFn = void Function();
16+
17+
// window.adsbygoogle uses "duck typing", so let us set anything to it.
18+
@JS('adsbygoogle')
19+
external set _adsbygoogle(JSAny? value);
20+
21+
/// Mocks `adsbygoogle` [push] function.
22+
///
23+
/// `push` will run in the next tick (`Timer.run`) to ensure async behavior.
24+
void mockAdsByGoogle(VoidFn push) {
25+
_adsbygoogle = <String, Object>{
26+
'push': () {
27+
Timer.run(push);
28+
}.toJS,
29+
}.jsify();
30+
}
31+
32+
/// Sets `adsbygoogle` to null.
33+
void clearAdsByGoogleMock() {
34+
_adsbygoogle = null;
35+
}
36+
37+
typedef MockAdConfig = ({Size size, String adStatus});
38+
39+
/// Returns a function that generates a "push" function for [mockAdsByGoogle].
40+
VoidFn mockAd({
41+
Size size = Size.zero,
42+
String adStatus = AdStatus.FILLED,
43+
}) {
44+
return mockAds(
45+
<MockAdConfig>[(size: size, adStatus: adStatus)],
46+
);
47+
}
48+
49+
/// Returns a function that handles a bunch of ad units at once. Can be used with [mockAdsByGoogle].
50+
VoidFn mockAds(List<MockAdConfig> adConfigs) {
51+
return () {
52+
final List<web.HTMLElement> foundTargets =
53+
web.document.querySelectorAll('div[id^=adUnit] ins').toList;
54+
55+
for (int i = 0; i < foundTargets.length; i++) {
56+
final web.HTMLElement adTarget = foundTargets[i];
57+
if (adTarget.children.length > 0) {
58+
continue;
59+
}
60+
61+
final (:Size size, :String adStatus) = adConfigs[i];
62+
63+
final web.HTMLElement fakeAd = web.HTMLDivElement()
64+
..style.width = '${size.width}px'
65+
..style.height = '${size.height}px'
66+
..style.background = '#fabada';
67+
68+
// AdSense seems to be setting the width/height on the `ins` of the injected ad too.
69+
adTarget
70+
..style.width = '${size.width}px'
71+
..style.height = '${size.height}px'
72+
..style.display = 'block'
73+
..appendChild(fakeAd)
74+
..setAttribute('data-ad-status', adStatus);
75+
}
76+
};
77+
}
78+
79+
extension on web.NodeList {
80+
List<web.HTMLElement> get toList {
81+
final List<web.HTMLElement> result = <web.HTMLElement>[];
82+
for (int i = 0; i < length; i++) {
83+
final web.Node? node = item(i);
84+
if (node != null && node.isA<web.HTMLElement>()) {
85+
result.add(node as web.HTMLElement);
86+
}
87+
}
88+
return result;
89+
}
90+
}

‎packages/google_adsense/lib/src/js_interop/adsbygoogle.dart‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
@JS()
6+
library;
7+
8+
import 'dart:js_interop';
9+
10+
/// JS-interop mappings to the window.adsbygoogle object.
11+
extension type AdsByGoogle._(JSObject _) implements JSObject {
12+
/// Pushes some `params` to the `window.adsbygoogle` object.
13+
external void push(JSObject params);
14+
}
15+
16+
// window.adsbygoogle may be null if this package runs before the JS SDK loads.
17+
@JS('adsbygoogle')
18+
external AdsByGoogle? get _adsbygoogle;
19+
20+
// window.adsbygoogle uses "duck typing", so let us set anything to it.
21+
@JS('adsbygoogle')
22+
external set _adsbygoogle(JSAny? value);
23+
24+
/// Whether or not the `window.adsbygoogle` object is defined and not null.
25+
bool get adsbygooglePresent => _adsbygoogle.isDefinedAndNotNull;
26+
27+
/// Binding to the `adsbygoogle` JS global.
28+
///
29+
/// See: https://support.google.com/adsense/answer/9274516?hl=en&ref_topic=28893&sjid=11495822575537499409-EU
30+
AdsByGoogle get adsbygoogle {
31+
if (!adsbygooglePresent) {
32+
// Initialize _adsbygoole to "something that has a push method".
33+
_adsbygoogle = JSArray<JSObject>();
34+
}
35+
return _adsbygoogle!;
36+
}

‎packages/google_adsense/lib/src/js_interop/package_web_tweaks.dart‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
import 'dart:js_interop';
6+
7+
import 'package:web/web.dart' as web;
8+
9+
// Re-use of https://github.com/flutter/packages/blob/main/packages/google_identity_services_web/lib/src/js_interop/package_web_tweaks.dart
10+
11+
/// This extension gives web.window a nullable getter to the `trustedTypes`
12+
/// property, which needs to be used to check for feature support.
13+
extension NullableTrustedTypesGetter on web.Window {
14+
/// (Nullable) Bindings to window.trustedTypes.
15+
///
16+
/// This may be null if the browser doesn't support the Trusted Types API.
17+
///
18+
/// See: https://developer.mozilla.org/en-US/docs/Web/API/Trusted_Types_API
19+
@JS('trustedTypes')
20+
external web.TrustedTypePolicyFactory? get nullableTrustedTypes;
21+
}
22+
23+
/// Allows setting a TrustedScriptURL as the src of a script element.
24+
extension TrustedTypeSrcAttribute on web.HTMLScriptElement {
25+
@JS('src')
26+
external set trustedSrc(web.TrustedScriptURL value);
27+
}
28+
29+
/// Allows creating a script URL only from a string, with no arguments.
30+
extension CreateScriptUrlNoArgs on web.TrustedTypePolicy {
31+
/// Allows calling `createScriptURL` with only the `input` argument.
32+
@JS('createScriptURL')
33+
external web.TrustedScriptURL createScriptURLNoArgs(String input);
34+
}
35+
36+
/// Exception thrown if the Trusted Types feature is supported, enabled, and it
37+
/// has prevented this loader from injecting the JS SDK.
38+
class TrustedTypesException implements Exception {
39+
///
40+
TrustedTypesException(this.message);
41+
42+
/// The message of the exception
43+
final String message;
44+
45+
@override
46+
String toString() => 'TrustedTypesException: $message';
47+
}

‎packages/google_maps_flutter/google_maps_flutter_android/lib/src/messages.g.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1192,7 +1192,7 @@ class PlatformMapConfiguration {
11921192
this.trafficEnabled,
11931193
this.buildingsEnabled,
11941194
this.liteModeEnabled,
1195-
this.mapId,
1195+
this.cloudMapId,
11961196
this.style,
11971197
});
11981198

@@ -1232,7 +1232,7 @@ class PlatformMapConfiguration {
12321232

12331233
bool? liteModeEnabled;
12341234

1235-
String? mapId;
1235+
String? cloudMapId;
12361236

12371237
String? style;
12381238

@@ -1256,7 +1256,7 @@ class PlatformMapConfiguration {
12561256
trafficEnabled,
12571257
buildingsEnabled,
12581258
liteModeEnabled,
1259-
mapId,
1259+
cloudMapId,
12601260
style,
12611261
];
12621262
}
@@ -1282,7 +1282,7 @@ class PlatformMapConfiguration {
12821282
trafficEnabled: result[15] as bool?,
12831283
buildingsEnabled: result[16] as bool?,
12841284
liteModeEnabled: result[17] as bool?,
1285-
mapId: result[18] as String?,
1285+
cloudMapId: result[18] as String?,
12861286
style: result[19] as String?,
12871287
);
12881288
}

‎packages/google_maps_flutter/google_maps_flutter_android/pigeons/messages.dart‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -465,9 +465,7 @@ class PlatformMapViewCreationParams {
465465
}
466466

467467
enum PlatformMarkerType {
468-
marker,
469-
advancedMarker,
470-
}
468+
marker, advancedMarker,}
471469

472470
/// Pigeon equivalent of MapConfiguration.
473471
class PlatformMapConfiguration {

‎packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/GoogleMapMarkerController.m‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,23 @@ - (void)setZIndex:(int)zIndex {
107107
self.marker.zIndex = zIndex;
108108
}
109109

110+
- (void)updateFromPlatformMarker:(FGMPlatformMarker *)platformMarker
111+
registrar:(NSObject<FlutterPluginRegistrar> *)registrar
112+
screenScale:(CGFloat)screenScale {
113+
[self setAlpha:platformMarker.alpha];
114+
[self setAnchor:FGMGetCGPointForPigeonPoint(platformMarker.anchor)];
115+
[self setDraggable:platformMarker.draggable];
116+
UIImage *image = [self iconFromBitmap:platformMarker.icon
117+
registrar:registrar
118+
screenScale:screenScale];
119+
[self setIcon:image];
120+
[self setFlat:platformMarker.flat];
121+
[self setConsumeTapEvents:platformMarker.consumeTapEvents];
122+
[self setPosition:FGMGetCoordinateForPigeonLatLng(platformMarker.position)];
123+
[self setRotation:platformMarker.rotation];
124+
[self setVisible:platformMarker.visible];
125+
[self setZIndex:platformMarker.zIndex];
126+
}
110127
- (void)setCollisionBehavior:(int)collisionBehavior {
111128
if ([self.marker isKindOfClass:[GMSAdvancedMarker class]]) {
112129
GMSCollisionBehavior collitionBehaviorValue = (GMSCollisionBehavior)collisionBehavior;

‎packages/google_maps_flutter/google_maps_flutter_ios/ios/Classes/messages.g.m‎

Lines changed: 4 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,7 +1232,7 @@ + (instancetype)makeWithCompassEnabled:(nullable NSNumber *)compassEnabled
12321232
indoorViewEnabled:(nullable NSNumber *)indoorViewEnabled
12331233
trafficEnabled:(nullable NSNumber *)trafficEnabled
12341234
buildingsEnabled:(nullable NSNumber *)buildingsEnabled
1235-
mapId:(nullable NSString *)mapId
1235+
cloudMapId:(nullable NSString *)cloudMapId
12361236
style:(nullable NSString *)style {
12371237
FGMPlatformMapConfiguration *pigeonResult = [[FGMPlatformMapConfiguration alloc] init];
12381238
pigeonResult.compassEnabled = compassEnabled;
@@ -1250,7 +1250,7 @@ + (instancetype)makeWithCompassEnabled:(nullable NSNumber *)compassEnabled
12501250
pigeonResult.indoorViewEnabled = indoorViewEnabled;
12511251
pigeonResult.trafficEnabled = trafficEnabled;
12521252
pigeonResult.buildingsEnabled = buildingsEnabled;
1253-
pigeonResult.mapId = mapId;
1253+
pigeonResult.cloudMapId = cloudMapId;
12541254
pigeonResult.style = style;
12551255
return pigeonResult;
12561256
}
@@ -1271,7 +1271,7 @@ + (FGMPlatformMapConfiguration *)fromList:(NSArray<id> *)list {
12711271
pigeonResult.indoorViewEnabled = GetNullableObjectAtIndex(list, 12);
12721272
pigeonResult.trafficEnabled = GetNullableObjectAtIndex(list, 13);
12731273
pigeonResult.buildingsEnabled = GetNullableObjectAtIndex(list, 14);
1274-
pigeonResult.mapId = GetNullableObjectAtIndex(list, 15);
1274+
pigeonResult.cloudMapId = GetNullableObjectAtIndex(list, 15);
12751275
pigeonResult.style = GetNullableObjectAtIndex(list, 16);
12761276
return pigeonResult;
12771277
}
@@ -1295,7 +1295,7 @@ + (nullable FGMPlatformMapConfiguration *)nullableFromList:(NSArray<id> *)list {
12951295
self.indoorViewEnabled ?: [NSNull null],
12961296
self.trafficEnabled ?: [NSNull null],
12971297
self.buildingsEnabled ?: [NSNull null],
1298-
self.mapId ?: [NSNull null],
1298+
self.cloudMapId ?: [NSNull null],
12991299
self.style ?: [NSNull null],
13001300
];
13011301
}
@@ -2510,28 +2510,6 @@ void SetUpFGMMapsApiWithSuffix(id<FlutterBinaryMessenger> binaryMessenger,
25102510
[channel setMessageHandler:nil];
25112511
}
25122512
}
2513-
/// Returns true if the map supports advanced markers
2514-
{
2515-
FlutterBasicMessageChannel *channel = [[FlutterBasicMessageChannel alloc]
2516-
initWithName:[NSString stringWithFormat:@"%@%@",
2517-
@"dev.flutter.pigeon.google_maps_flutter_ios."
2518-
@"MapsApi.isAdvancedMarkersAvailable",
2519-
messageChannelSuffix]
2520-
binaryMessenger:binaryMessenger
2521-
codec:FGMGetMessagesCodec()];
2522-
if (api) {
2523-
NSCAssert([api respondsToSelector:@selector(isAdvancedMarkersAvailable:)],
2524-
@"FGMMapsApi api (%@) doesn't respond to @selector(isAdvancedMarkersAvailable:)",
2525-
api);
2526-
[channel setMessageHandler:^(id _Nullable message, FlutterReply callback) {
2527-
FlutterError *error;
2528-
NSNumber *output = [api isAdvancedMarkersAvailable:&error];
2529-
callback(wrapResult(output, error));
2530-
}];
2531-
} else {
2532-
[channel setMessageHandler:nil];
2533-
}
2534-
}
25352513
}
25362514
@interface FGMMapsCallbackApi ()
25372515
@property(nonatomic, strong) NSObject<FlutterBinaryMessenger> *binaryMessenger;

0 commit comments

Comments
 (0)