Skip to content
This repository has been archived by the owner on Feb 22, 2023. It is now read-only.

upgraded usage of BinaryMessenger #4451

Merged
merged 5 commits into from
Oct 26, 2021

Conversation

gaaclarke
Copy link
Member

@gaaclarke gaaclarke commented Oct 25, 2021

flutter/engine#29147 introduced a breaking change to BinaryMessenger (breaking change guide coming). This upgrades all the files that had a dependency on that interface.

In order to accomplish this I added a new CI step that will modify code on the stable channel.

This PR also contains #4452 in order to fix the tree in one commit.

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the relevant style guides and ran the auto-formatter. (Note that unlike the flutter/flutter repo, the flutter/plugins repo does use dart format.)
  • I signed the CLA.
  • The title of the PR starts with the name of the plugin surrounded by square brackets, e.g. [shared_preferences]
  • I listed at least one issue that this PR fixes in the description above.
  • I updated pubspec.yaml with an appropriate new version according to the pub versioning philosophy.
  • I updated CHANGELOG.md to add a description of the change.
  • I updated/added relevant documentation (doc comments with ///).
  • I added new tests to check the change I am making or feature I am adding, or Hixie said the PR is test exempt.
  • All existing and new tests are passing.

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

@gaaclarke gaaclarke force-pushed the upgrade-binary-messenger branch 5 times, most recently from 26799c2 to 84d9fd4 Compare October 25, 2021 23:06
@ditman
Copy link
Member

ditman commented Oct 26, 2021

In order to fix the web-platform_tests CHANNEL:master, I'm cherry-picking this PR here.

@google-cla

This comment has been minimized.

@ditman

This comment has been minimized.

Copy link
Contributor

@stuartmorgan stuartmorgan left a comment

Choose a reason for hiding this comment

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

Please update the PR description to reflect that this is two unrelated PRs smashed together, and describe both of them.

.cirrus.yml Outdated Show resolved Hide resolved
//
// Example input:
// int main() {
// // FLUTTER_STABLE_CHANNEL_BEGIN
Copy link
Contributor

Choose a reason for hiding this comment

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

This naming is really confusing to me, since the name right after this is what is not going to be on the stable channel.

What if we reverse it and do:

// FLUTTER_STABLE_CHANNEL_BEGIN
// [stable things]
// FLUTTER_STABLE_CHANNEL_ELSE
[not-stable things]
// FLUTTER_STABLE_CHANNEL_END

Copy link
Member Author

Choose a reason for hiding this comment

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

Yea, that makes sense. With this naming "FLUTTER_STABLE_CHANNEL_" was just meant as a prefix for who is operating and not meant to be read as having meaning for the operation. Is there some way we can name it so that the master channel is on the top? I think it's easier to read the code if what is going to be happening the majority of the time is closer to the place where it will be. The exceptional code should be farther away.

//  FLUTTER_STABLE_CONDITIONAL_IF_NOT_STABLE
//  FLUTTER_STABLE_CONDITIONAL_ELSE
//  FLUTTER_STABLE_CONDITIONAL_ENDIF

That way the prefix matches the name of the script, it keeps the naming similar to what you want but keeps the exceptional case at the bottom.

Copy link
Member Author

Choose a reason for hiding this comment

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

done

ci/stable_conditional.dart Outdated Show resolved Hide resolved
ci/stable_conditional.dart Outdated Show resolved Hide resolved
 - renamed comments
 - forced `//`
 - put conditional in cirrus.yml
 - put explicit list of files to process
 - added space in comment
Copy link
Contributor

@stuartmorgan stuartmorgan left a comment

Choose a reason for hiding this comment

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

LGTM with nits

ci/stable_conditional.dart Outdated Show resolved Hide resolved
ci/stable_conditional.dart Outdated Show resolved Hide resolved
@gaaclarke
Copy link
Member Author

landing on red to open tree

@gaaclarke gaaclarke merged commit 9d63517 into flutter:master Oct 26, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 26, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 26, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 27, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 27, 2021
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Oct 27, 2021
gaaclarke added a commit to gaaclarke/plugins that referenced this pull request Oct 27, 2021
This reverts commit 9d63517.

The work to accomodate the breaking change is no longer necessary.
NickalasB added a commit to NickalasB/plugins that referenced this pull request Oct 27, 2021
* master:
  Implement Android WebView api with pigeon (Java portion) (flutter#4441)
  [in_app_purchase] Update to the latest pkg:json_serializable (flutter#4434)
  Implement Android WebView api with pigeon (Dart portion)  (flutter#4435)
  upgraded usage of BinaryMessenger (flutter#4451)
  [flutter_plugin_tools] Fix pubspec-check on Windows (flutter#4428)
  Use OpenJDK 11 in CI jobs  (flutter#4419)
  [google_sign_in] remove the commented out code in tests (flutter#4442)
NickalasB added a commit to NickalasB/plugins that referenced this pull request Oct 27, 2021
* master:
  Implement Android WebView api with pigeon (Java portion) (flutter#4441)
  [in_app_purchase] Update to the latest pkg:json_serializable (flutter#4434)
  Implement Android WebView api with pigeon (Dart portion)  (flutter#4435)
  upgraded usage of BinaryMessenger (flutter#4451)
  [flutter_plugin_tools] Fix pubspec-check on Windows (flutter#4428)
  Use OpenJDK 11 in CI jobs  (flutter#4419)
  [google_sign_in] remove the commented out code in tests (flutter#4442)
gaaclarke added a commit to gaaclarke/plugins that referenced this pull request Oct 27, 2021
This reverts commit 9d63517.

The work to accomodate the breaking change is no longer necessary.
gaaclarke added a commit that referenced this pull request Oct 27, 2021
This reverts commit 9d63517.

The work to accomodate the breaking change is no longer necessary.
NickalasB added a commit to NickalasB/plugins that referenced this pull request Oct 27, 2021
* master:
  [ci.yaml] Main branch support (flutter#4440)
  [video_player] Initialize player when size and duration become available (flutter#4438)
  [webview_flutter] Implement zoom enabled for ios and android (flutter#4417)
  Partial revert of "upgraded usage of BinaryMessenger (flutter#4451)" (flutter#4453)
hofmannfelix pushed a commit to hofmannfelix/plugins that referenced this pull request Oct 30, 2021
…ideo_src_on_same_controller

* commit '76e84c0679dbab7bfaaaa553b17bb0dbdb9a3c33': (537 commits)
  [video_player] Initialize player when size and duration become available (flutter#4438)
  [webview_flutter] Implement zoom enabled for ios and android (flutter#4417)
  Partial revert of "upgraded usage of BinaryMessenger (flutter#4451)" (flutter#4453)
  Implement Android WebView api with pigeon (Java portion) (flutter#4441)
  [in_app_purchase] Update to the latest pkg:json_serializable (flutter#4434)
  Implement Android WebView api with pigeon (Dart portion)  (flutter#4435)
  upgraded usage of BinaryMessenger (flutter#4451)
  [flutter_plugin_tools] Fix pubspec-check on Windows (flutter#4428)
  Use OpenJDK 11 in CI jobs  (flutter#4419)
  [google_sign_in] remove the commented out code in tests (flutter#4442)
  [webview] Fix typos in the README (flutter#4249)
  [google_sign_in] add serverAuthCode to GoogleSignInAccount (flutter#4180)
  [ci] Update macOS Cirrus image to Xcode 13 (flutter#4429)
  [shared_preferences] Switch to new analysis options (flutter#4384)
  [flutter_plugin_android_lifecycle] remove placeholder dart file (flutter#4413)
  [camera] Run iOS methods on UI thread by default (flutter#4140)
  [ci] Always run all `format` steps (flutter#4427)
  [flutter_plugin_tools] Fix license-check on Windows (flutter#4425)
  [google_maps_flutter] Clean Java test, consolidate Marker example. (flutter#4400)
  [image_picker][android] suppress unchecked warning (flutter#4408)
  ...

# Conflicts:
#	packages/video_player/video_player/pubspec.yaml
#	packages/video_player/video_player_web/lib/video_player_web.dart
#	packages/video_player/video_player_web/pubspec.yaml
amantoux pushed a commit to amantoux/plugins that referenced this pull request Dec 11, 2021
Co-authored-by: David Iglesias Teixeira <ditman@gmail.com>
amantoux pushed a commit to amantoux/plugins that referenced this pull request Dec 11, 2021
…lutter#4453)

This reverts commit 9d63517.

The work to accomodate the breaking change is no longer necessary.
KyleFin pushed a commit to KyleFin/plugins that referenced this pull request Dec 21, 2021
Co-authored-by: David Iglesias Teixeira <ditman@gmail.com>
KyleFin pushed a commit to KyleFin/plugins that referenced this pull request Dec 21, 2021
…lutter#4453)

This reverts commit 9d63517.

The work to accomodate the breaking change is no longer necessary.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
3 participants