From ab626d73d98952aae4ccb29ea25c0fd397c61f87 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 3 Jan 2020 10:51:05 -0800 Subject: [PATCH 1/4] BinaryMessages migration for package:connectivity --- packages/connectivity/CHANGELOG.md | 5 +++++ packages/connectivity/pubspec.yaml | 4 ++-- packages/connectivity/test/connectivity_test.dart | 6 ++---- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md index b600354a5901..60bfcd0e2942 100644 --- a/packages/connectivity/CHANGELOG.md +++ b/packages/connectivity/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.4.7 + +* Migrate deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger. +* Bump Flutter SDK to 1.12.13+hotfix.5 or greater (current stable). + ## 0.4.6+1 * Remove the deprecated `author:` field from pubspec.yaml diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml index b12d3c271c66..3fff65e4a655 100644 --- a/packages/connectivity/pubspec.yaml +++ b/packages/connectivity/pubspec.yaml @@ -2,7 +2,7 @@ name: connectivity description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity -version: 0.4.6+1 +version: 0.4.7 flutter: plugin: @@ -28,4 +28,4 @@ dev_dependencies: environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=1.10.0 <2.0.0" + flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/packages/connectivity/test/connectivity_test.dart b/packages/connectivity/test/connectivity_test.dart index 892e7d0085c5..39bd42f840f5 100644 --- a/packages/connectivity/test/connectivity_test.dart +++ b/packages/connectivity/test/connectivity_test.dart @@ -38,10 +38,8 @@ void main() { .setMockMethodCallHandler((MethodCall methodCall) async { switch (methodCall.method) { case 'listen': - // TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable. - // https://github.com/flutter/flutter/issues/33446 - // ignore: deprecated_member_use - await BinaryMessages.handlePlatformMessage( + await ServicesBinding.instance.defaultBinaryMessenger + .handlePlatformMessage( Connectivity.eventChannel.name, Connectivity.eventChannel.codec.encodeSuccessEnvelope('wifi'), (_) {}, From 9bddc0e1abdb1c9cba408d2e0ab91d238ff191ab Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 3 Jan 2020 10:56:57 -0800 Subject: [PATCH 2/4] Migrate package:sensors from deprecated BinaryMessages --- packages/sensors/CHANGELOG.md | 5 +++++ packages/sensors/pubspec.yaml | 4 ++-- packages/sensors/test/sensors_test.dart | 11 +++-------- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/packages/sensors/CHANGELOG.md b/packages/sensors/CHANGELOG.md index 4d09a924870a..cbe7076e4c9e 100644 --- a/packages/sensors/CHANGELOG.md +++ b/packages/sensors/CHANGELOG.md @@ -1,3 +1,8 @@ +## 0.4.2 + +* Migrate from deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger. +* Require Flutter SDK 1.12.13+hotfix.5 or greater (current stable). + ## 0.4.1+5 * Fix example `setState()` called after `dispose()` by canceling the timer. diff --git a/packages/sensors/pubspec.yaml b/packages/sensors/pubspec.yaml index 0684e921ee78..50546ce4ea99 100644 --- a/packages/sensors/pubspec.yaml +++ b/packages/sensors/pubspec.yaml @@ -2,7 +2,7 @@ name: sensors description: Flutter plugin for accessing the Android and iOS accelerometer and gyroscope sensors. homepage: https://github.com/flutter/plugins/tree/master/packages/sensors -version: 0.4.1+5 +version: 0.4.2 flutter: plugin: @@ -26,4 +26,4 @@ dev_dependencies: environment: sdk: ">=2.0.0-dev.28.0 <3.0.0" - flutter: ">=1.10.0 <2.0.0" + flutter: ">=1.12.13+hotfix.5 <2.0.0" diff --git a/packages/sensors/test/sensors_test.dart b/packages/sensors/test/sensors_test.dart index 1485d589ad72..832a2f8524b7 100644 --- a/packages/sensors/test/sensors_test.dart +++ b/packages/sensors/test/sensors_test.dart @@ -53,20 +53,15 @@ void _initializeFakeSensorChannel(String channelName, List sensorData) { const StandardMethodCodec standardMethod = StandardMethodCodec(); void _emitEvent(ByteData event) { - // TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable. - // https://github.com/flutter/flutter/issues/33446 - // ignore: deprecated_member_use - BinaryMessages.handlePlatformMessage( + ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( channelName, event, (ByteData reply) {}, ); } - // TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable. - // https://github.com/flutter/flutter/issues/33446 - // ignore: deprecated_member_use - BinaryMessages.setMockMessageHandler(channelName, (ByteData message) async { + ServicesBinding.instance.defaultBinaryMessenger + .setMockMessageHandler(channelName, (ByteData message) async { final MethodCall methodCall = standardMethod.decodeMethodCall(message); if (methodCall.method == 'listen') { _emitEvent(standardMethod.encodeSuccessEnvelope(sensorData)); From 1c30f5cd6e636eb2139d579ecffb4ac4980fbd50 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 3 Jan 2020 11:07:16 -0800 Subject: [PATCH 3/4] Migrate package:webview_flutter from deprecated BinaryMessages --- packages/webview_flutter/CHANGELOG.md | 4 ++++ packages/webview_flutter/pubspec.yaml | 2 +- .../test/webview_flutter_test.dart | 23 +++++-------------- 3 files changed, 11 insertions(+), 18 deletions(-) diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index 3bfcd6778c95..75f13d0c7d96 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.3.20 + +* Migrate from deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger. + ## 0.3.19+1 * Raise min Flutter SDK requirement to the latest stable. v2 embedding apps no diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml index 425239e0a06d..e7003c62f066 100644 --- a/packages/webview_flutter/pubspec.yaml +++ b/packages/webview_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: webview_flutter description: A Flutter plugin that provides a WebView widget on Android and iOS. -version: 0.3.19+1 +version: 0.3.20 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter environment: diff --git a/packages/webview_flutter/test/webview_flutter_test.dart b/packages/webview_flutter/test/webview_flutter_test.dart index 10c7bbb460e0..c7cf46a080d7 100644 --- a/packages/webview_flutter/test/webview_flutter_test.dart +++ b/packages/webview_flutter/test/webview_flutter_test.dart @@ -994,11 +994,8 @@ class FakePlatformWebView { }; final ByteData data = codec .encodeMethodCall(MethodCall('javascriptChannelMessage', arguments)); - // TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable. - // https://github.com/flutter/flutter/issues/33446 - // ignore: deprecated_member_use - BinaryMessages.handlePlatformMessage( - channel.name, data, (ByteData data) {}); + ServicesBinding.instance.defaultBinaryMessenger + .handlePlatformMessage(channel.name, data, (ByteData data) {}); } // Fakes a main frame navigation that was initiated by the webview, e.g when @@ -1016,10 +1013,8 @@ class FakePlatformWebView { }; final ByteData data = codec.encodeMethodCall(MethodCall('navigationRequest', arguments)); - // TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable. - // https://github.com/flutter/flutter/issues/33446 - // ignore: deprecated_member_use - BinaryMessages.handlePlatformMessage(channel.name, data, (ByteData data) { + ServicesBinding.instance.defaultBinaryMessenger + .handlePlatformMessage(channel.name, data, (ByteData data) { final bool allow = codec.decodeEnvelope(data); if (allow) { _loadUrl(url); @@ -1035,10 +1030,7 @@ class FakePlatformWebView { {'url': currentUrl}, )); - // TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable. - // https://github.com/flutter/flutter/issues/33446 - // ignore: deprecated_member_use - BinaryMessages.handlePlatformMessage( + ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( channel.name, data, (ByteData data) {}, @@ -1053,10 +1045,7 @@ class FakePlatformWebView { {'url': currentUrl}, )); - // TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable. - // https://github.com/flutter/flutter/issues/33446 - // ignore: deprecated_member_use - BinaryMessages.handlePlatformMessage( + ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage( channel.name, data, (ByteData data) {}, From 1e89f4c0eb73acac0fa0d7aa6899187c06c80c29 Mon Sep 17 00:00:00 2001 From: Harry Terkelsen Date: Fri, 3 Jan 2020 15:20:15 -0800 Subject: [PATCH 4/4] Only do patch bumps --- packages/connectivity/CHANGELOG.md | 2 +- packages/connectivity/pubspec.yaml | 2 +- packages/sensors/CHANGELOG.md | 2 +- packages/sensors/pubspec.yaml | 2 +- packages/webview_flutter/CHANGELOG.md | 2 +- packages/webview_flutter/pubspec.yaml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/connectivity/CHANGELOG.md b/packages/connectivity/CHANGELOG.md index 60bfcd0e2942..57741ee0f229 100644 --- a/packages/connectivity/CHANGELOG.md +++ b/packages/connectivity/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.4.7 +## 0.4.6+2 * Migrate deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger. * Bump Flutter SDK to 1.12.13+hotfix.5 or greater (current stable). diff --git a/packages/connectivity/pubspec.yaml b/packages/connectivity/pubspec.yaml index 3fff65e4a655..91ba068aa41c 100644 --- a/packages/connectivity/pubspec.yaml +++ b/packages/connectivity/pubspec.yaml @@ -2,7 +2,7 @@ name: connectivity description: Flutter plugin for discovering the state of the network (WiFi & mobile/cellular) connectivity on Android and iOS. homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity -version: 0.4.7 +version: 0.4.6+2 flutter: plugin: diff --git a/packages/sensors/CHANGELOG.md b/packages/sensors/CHANGELOG.md index cbe7076e4c9e..e4984c0b91db 100644 --- a/packages/sensors/CHANGELOG.md +++ b/packages/sensors/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.4.2 +## 0.4.1+6 * Migrate from deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger. * Require Flutter SDK 1.12.13+hotfix.5 or greater (current stable). diff --git a/packages/sensors/pubspec.yaml b/packages/sensors/pubspec.yaml index 50546ce4ea99..1a3f4237295e 100644 --- a/packages/sensors/pubspec.yaml +++ b/packages/sensors/pubspec.yaml @@ -2,7 +2,7 @@ name: sensors description: Flutter plugin for accessing the Android and iOS accelerometer and gyroscope sensors. homepage: https://github.com/flutter/plugins/tree/master/packages/sensors -version: 0.4.2 +version: 0.4.1+6 flutter: plugin: diff --git a/packages/webview_flutter/CHANGELOG.md b/packages/webview_flutter/CHANGELOG.md index 75f13d0c7d96..52b64162b3c0 100644 --- a/packages/webview_flutter/CHANGELOG.md +++ b/packages/webview_flutter/CHANGELOG.md @@ -1,4 +1,4 @@ -## 0.3.20 +## 0.3.19+2 * Migrate from deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger. diff --git a/packages/webview_flutter/pubspec.yaml b/packages/webview_flutter/pubspec.yaml index e7003c62f066..5e2a85249de5 100644 --- a/packages/webview_flutter/pubspec.yaml +++ b/packages/webview_flutter/pubspec.yaml @@ -1,6 +1,6 @@ name: webview_flutter description: A Flutter plugin that provides a WebView widget on Android and iOS. -version: 0.3.20 +version: 0.3.19+2 homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter environment: