-
Notifications
You must be signed in to change notification settings - Fork 9.8k
Conversation
8c77df3
to
0e4c188
Compare
0e4c188
to
bc16b95
Compare
26799c2
to
84d9fd4
Compare
84d9fd4
to
755e897
Compare
In order to fix the |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
There was a problem hiding this 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.
ci/stable_conditional.dart
Outdated
// | ||
// Example input: | ||
// int main() { | ||
// // FLUTTER_STABLE_CHANNEL_BEGIN |
There was a problem hiding this comment.
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
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
done
...intent/android/src/test/java/io/flutter/plugins/androidintent/MethodCallHandlerImplTest.java
Outdated
Show resolved
Hide resolved
packages/camera/camera/android/src/test/java/io/flutter/plugins/camera/DartMessengerTest.java
Outdated
Show resolved
Hide resolved
- renamed comments - forced `//` - put conditional in cirrus.yml - put explicit list of files to process - added space in comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM with nits
landing on red to open tree |
This reverts commit 9d63517. The work to accomodate the breaking change is no longer necessary.
* 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)
* 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)
This reverts commit 9d63517. The work to accomodate the breaking change is no longer necessary.
* 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)
…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
Co-authored-by: David Iglesias Teixeira <[email protected]>
…lutter#4453) This reverts commit 9d63517. The work to accomodate the breaking change is no longer necessary.
Co-authored-by: David Iglesias Teixeira <[email protected]>
…lutter#4453) This reverts commit 9d63517. The work to accomodate the breaking change is no longer necessary.
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
dart format
.)[shared_preferences]
///
).If you need help, consider asking for advice on the #hackers-new channel on Discord.