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

Commit 0a9d0c5

Browse files
author
Harry Terkelsen
authored
Migrate away from deprecated BinaryMessages (#2444)
* BinaryMessages migration for package:connectivity * Migrate package:sensors from deprecated BinaryMessages * Migrate package:webview_flutter from deprecated BinaryMessages * Only do patch bumps
1 parent d30a049 commit 0a9d0c5

9 files changed

Lines changed: 30 additions & 34 deletions

File tree

‎packages/connectivity/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.4.6+2
2+
3+
* Migrate deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger.
4+
* Bump Flutter SDK to 1.12.13+hotfix.5 or greater (current stable).
5+
16
## 0.4.6+1
27

38
* Remove the deprecated `author:` field from pubspec.yaml

‎packages/connectivity/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: connectivity
22
description: Flutter plugin for discovering the state of the network (WiFi &
33
mobile/cellular) connectivity on Android and iOS.
44
homepage: https://github.com/flutter/plugins/tree/master/packages/connectivity
5-
version: 0.4.6+1
5+
version: 0.4.6+2
66

77
flutter:
88
plugin:
@@ -28,4 +28,4 @@ dev_dependencies:
2828

2929
environment:
3030
sdk: ">=2.0.0-dev.28.0 <3.0.0"
31-
flutter: ">=1.10.0 <2.0.0"
31+
flutter: ">=1.12.13+hotfix.5 <2.0.0"

‎packages/connectivity/test/connectivity_test.dart‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,8 @@ void main() {
3838
.setMockMethodCallHandler((MethodCall methodCall) async {
3939
switch (methodCall.method) {
4040
case 'listen':
41-
// TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable.
42-
// https://github.com/flutter/flutter/issues/33446
43-
// ignore: deprecated_member_use
44-
await BinaryMessages.handlePlatformMessage(
41+
await ServicesBinding.instance.defaultBinaryMessenger
42+
.handlePlatformMessage(
4543
Connectivity.eventChannel.name,
4644
Connectivity.eventChannel.codec.encodeSuccessEnvelope('wifi'),
4745
(_) {},

‎packages/sensors/CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
## 0.4.1+6
2+
3+
* Migrate from deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger.
4+
* Require Flutter SDK 1.12.13+hotfix.5 or greater (current stable).
5+
16
## 0.4.1+5
27

38
* Fix example `setState()` called after `dispose()` by canceling the timer.

‎packages/sensors/pubspec.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: sensors
22
description: Flutter plugin for accessing the Android and iOS accelerometer and
33
gyroscope sensors.
44
homepage: https://github.com/flutter/plugins/tree/master/packages/sensors
5-
version: 0.4.1+5
5+
version: 0.4.1+6
66

77
flutter:
88
plugin:
@@ -26,4 +26,4 @@ dev_dependencies:
2626

2727
environment:
2828
sdk: ">=2.0.0-dev.28.0 <3.0.0"
29-
flutter: ">=1.10.0 <2.0.0"
29+
flutter: ">=1.12.13+hotfix.5 <2.0.0"

‎packages/sensors/test/sensors_test.dart‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,20 +53,15 @@ void _initializeFakeSensorChannel(String channelName, List<double> sensorData) {
5353
const StandardMethodCodec standardMethod = StandardMethodCodec();
5454

5555
void _emitEvent(ByteData event) {
56-
// TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable.
57-
// https://github.com/flutter/flutter/issues/33446
58-
// ignore: deprecated_member_use
59-
BinaryMessages.handlePlatformMessage(
56+
ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage(
6057
channelName,
6158
event,
6259
(ByteData reply) {},
6360
);
6461
}
6562

66-
// TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable.
67-
// https://github.com/flutter/flutter/issues/33446
68-
// ignore: deprecated_member_use
69-
BinaryMessages.setMockMessageHandler(channelName, (ByteData message) async {
63+
ServicesBinding.instance.defaultBinaryMessenger
64+
.setMockMessageHandler(channelName, (ByteData message) async {
7065
final MethodCall methodCall = standardMethod.decodeMethodCall(message);
7166
if (methodCall.method == 'listen') {
7267
_emitEvent(standardMethod.encodeSuccessEnvelope(sensorData));

‎packages/webview_flutter/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 0.3.19+2
2+
3+
* Migrate from deprecated BinaryMessages to ServicesBinding.instance.defaultBinaryMessenger.
4+
15
## 0.3.19+1
26

37
* Raise min Flutter SDK requirement to the latest stable. v2 embedding apps no

‎packages/webview_flutter/pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: webview_flutter
22
description: A Flutter plugin that provides a WebView widget on Android and iOS.
3-
version: 0.3.19+1
3+
version: 0.3.19+2
44
homepage: https://github.com/flutter/plugins/tree/master/packages/webview_flutter
55

66
environment:

‎packages/webview_flutter/test/webview_flutter_test.dart‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -994,11 +994,8 @@ class FakePlatformWebView {
994994
};
995995
final ByteData data = codec
996996
.encodeMethodCall(MethodCall('javascriptChannelMessage', arguments));
997-
// TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable.
998-
// https://github.com/flutter/flutter/issues/33446
999-
// ignore: deprecated_member_use
1000-
BinaryMessages.handlePlatformMessage(
1001-
channel.name, data, (ByteData data) {});
997+
ServicesBinding.instance.defaultBinaryMessenger
998+
.handlePlatformMessage(channel.name, data, (ByteData data) {});
1002999
}
10031000

10041001
// Fakes a main frame navigation that was initiated by the webview, e.g when
@@ -1016,10 +1013,8 @@ class FakePlatformWebView {
10161013
};
10171014
final ByteData data =
10181015
codec.encodeMethodCall(MethodCall('navigationRequest', arguments));
1019-
// TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable.
1020-
// https://github.com/flutter/flutter/issues/33446
1021-
// ignore: deprecated_member_use
1022-
BinaryMessages.handlePlatformMessage(channel.name, data, (ByteData data) {
1016+
ServicesBinding.instance.defaultBinaryMessenger
1017+
.handlePlatformMessage(channel.name, data, (ByteData data) {
10231018
final bool allow = codec.decodeEnvelope(data);
10241019
if (allow) {
10251020
_loadUrl(url);
@@ -1035,10 +1030,7 @@ class FakePlatformWebView {
10351030
<dynamic, dynamic>{'url': currentUrl},
10361031
));
10371032

1038-
// TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable.
1039-
// https://github.com/flutter/flutter/issues/33446
1040-
// ignore: deprecated_member_use
1041-
BinaryMessages.handlePlatformMessage(
1033+
ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage(
10421034
channel.name,
10431035
data,
10441036
(ByteData data) {},
@@ -1053,10 +1045,7 @@ class FakePlatformWebView {
10531045
<dynamic, dynamic>{'url': currentUrl},
10541046
));
10551047

1056-
// TODO(hterkelsen): Remove this when defaultBinaryMessages is in stable.
1057-
// https://github.com/flutter/flutter/issues/33446
1058-
// ignore: deprecated_member_use
1059-
BinaryMessages.handlePlatformMessage(
1048+
ServicesBinding.instance.defaultBinaryMessenger.handlePlatformMessage(
10601049
channel.name,
10611050
data,
10621051
(ByteData data) {},

0 commit comments

Comments
 (0)