Skip to content

Merge flutter/plugins #3233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3,550 commits into from
Feb 22, 2023
Merged

Conversation

stuartmorgan-g
Copy link
Contributor

Merges everything from the packages/ directory of flutter/plugins (which is essentially the entire remaining repository) into this repository, completing the core of the repository merge.

This is intended to be landed as a merge commit, to fully preserve commit histories, blame, etc. This will add another non-linear branch to the history, but this is consistent with how we've done other merges into this repository.

Part of flutter/flutter#113764

stuartmorgan-g and others added 30 commits September 1, 2022 14:40
Some integration tests behave slightly differently on Android when using
Hybrid Composition, and need to wait for a change to become true rather
than it being immediately true.

This replicates the changes from `google_maps_flutter_android` to the
app-facing copy of those integration tests.

Fixes tree breakage from publishing
flutter/plugins#6334
…6341)

Eliminates `MethodChannelVideoPlayer`, and instead makes the default a
no-op subclass of the interface (i.e., one that throws
`UnimplementedError` for everything). This moves the plugin from option
3 to option 2 in
https://docs.flutter.dev/go/platform-channels-in-federated-plugins.

This implementation is being removed because its use of Pigeon made
ongoing maintenance impractical. Since default implementations are
intended for backward compatibility with third-party native-only
implementations, the platform channel internals of default
implementations are considered part of the API surface. Pigeon considers
those details implementation details, which means it was impossible to
ever update the version of Pigeon used here without breaking changes.
This means that fundamentally, Pigeon is not a viable choice for default
implementations.

The alternative to removing it would be replacing it with a new
non-Pigeon method channel implementation, but that would also be a
breaking change, defeating the purpose of backward compatibility.
This would only benefit new third-party implementations, but new
implementations should implement the platform interface rather than
using the legacy default implementation.

Fixes flutter/flutter#110017
…ogle_maps_flutter/google_maps_flutter_android/android (flutter#6199)
…6377)

* Replace `errorColor` to land deprecations

* x

* x
…om `setCookieForInsances` to `setCookieForInstances` (flutter#6384)
…mage_picker/image_picker_android/android (flutter#6381)

* [image_picker]: Bump mockito-core

Bumps [mockito-core](https://github.com/mockito/mockito) from 3.10.0 to 4.8.0.
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](mockito/mockito@v3.10.0...v4.8.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

* Update tests for API changes

* format

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Stuart Morgan <[email protected]>
Rolls Flutter master to the version that first failed due to flutter/engine#33688

Updates the camera_windows mocks to include the new method so that the tests will compile on master.

Fixes the blocked roll.
@stuartmorgan-g
Copy link
Contributor Author

stuartmorgan-g commented Feb 21, 2023

Okay, everything but Windows dart_unit_tests passed on this run. I'm going to push the changes to both Windows and Linux unit test configs, and since those are the only things changing, call this good to land once those specific tests pass rather than waiting for all of the slowest tests to run yet again.

Copy link
Member

@ditman ditman left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's go!

- Disable web plugin implementation package Dart tests on Windows hosts;
  that config has never been supported.
- Split Linux Dart unit tests into two shards, since tehy are now quite
  long.
- Disable `flutter_migrate` Dart tests on the Windows host, for time.
- Temporarily disable a failing test on `stable`, with a TODO+issue.
@stuartmorgan-g
Copy link
Contributor Author

Re-running with more Windows Dart unit test exclusions due to the running-unit-tests-in-Chrome issue.

Excludes two other Dart unit tests that have pre-existing issues running on Windows hosts.
@stuartmorgan-g stuartmorgan-g merged commit 2e16733 into flutter:main Feb 22, 2023
@stuartmorgan-g stuartmorgan-g deleted the merge-flutter-plugins branch February 22, 2023 15:40
ditman added a commit to ditman/flutter-flutter that referenced this pull request Feb 24, 2023
* ad48ee5 [go_router] Fix some broken links in doc (flutter/packages#3288)
* 58ac45e [go_router_builder] Add support for Iterable, List  and Set to TypedGoRoute (flutter/packages#2679)
* 0edae25 Export super types in route_data.dart library (flutter/packages#3286)
* 8ad3fde [go_router] Add `GoRouter.maybeOf` (flutter/packages#3216)
* 13ee644 [flutter_migrate] Skip slow tests (flutter/packages#3270)
* 3cc754a Update .gitignore with missing values from flutter/plugins (flutter/packages#3265)
* c0f0a22 [ci] Re-enable pathified unit tests (flutter/packages#3268)
* 5834b4c [go_router]: implemented helpers for ShellRoute (flutter/packages#2730)
* af5906b [extension_gsi] Update extension to support gsi 5 and 6. (flutter/packages#3235)
* 195f4e8 Merge in plugin README and CONTRIBUTING (flutter/packages#3252)
* fab47af [go_router] Disable logging in tests (flutter/packages#3263)
* 25f0f70 [various] Update flutter/plugins links (flutter/packages#3256)
* 2e16733 Merge flutter/plugins (flutter/packages#3233)
* 324a7f2 Exclude more tests on Windows
* 334b58e Adjust test configs
* 69e6dac [go_router_builder] Generate replace method in RouteExtension (flutter/packages#2838)
* 193e454 Merge repository metadata
* 18715d7 Merge remote-tracking branch 'plugins-packages/main' into merge-flutter-plugins
* f2d802d Roll Flutter from ae8d051 to 7175de4 (4 revisions) (flutter/packages#3232)
* 6f1b1e8 Roll Flutter from 33e4d21 to ae8d051 (6 revisions) (flutter/packages#3229)
* a162a98 Roll Flutter from 0be7c3f to 33e4d21 (5 revisions) (flutter/packages#3227)
* ab5a8c0 [tool] Allow importing packages with NEXT (flutter/packages#3215)
* ce9c61b Roll Flutter from 170539f to 0be7c3f (38 revisions) (flutter/packages#3225)
* 9747469 Fix deprecation message for GoRouterState.namedLocation (flutter/packages#3092)
* 6e4431f [go_router] Bump example `compileSdkVersion` and `package_info_plus` dependency version (flutter/packages#3219)
* 925bea8 [pigeon] Validate generated files in CI (flutter/packages#3224)
* 3094867 Move iOS Swift unit tests back to Cirrus (flutter/packages#3221)
* 763d025 [pigeon] Eliminate some of the test pigeons (flutter/packages#3213)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment