From f1efcc47eccf380af62ca44288c83e0d08ae07b4 Mon Sep 17 00:00:00 2001 From: Maurice Parrish Date: Tue, 29 Dec 2020 22:48:04 -0500 Subject: [PATCH 1/3] migrate to null safety --- .../wifi_info_flutter_platform_interface/CHANGELOG.md | 4 ++++ .../lib/src/method_channel_wifi_info_flutter.dart | 9 +++++---- .../lib/wifi_info_flutter_platform_interface.dart | 6 +++--- .../wifi_info_flutter_platform_interface/pubspec.yaml | 8 ++++---- .../test/method_channel_wifi_info_flutter_test.dart | 8 ++++---- 5 files changed, 20 insertions(+), 15 deletions(-) diff --git a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/CHANGELOG.md b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/CHANGELOG.md index 951f8f5f5ae0..043a3d31b68d 100644 --- a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/CHANGELOG.md +++ b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.0.0-nullsafety + +* Migrate to null safety. + ## 1.0.1 * Update Flutter SDK constraint. diff --git a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/src/method_channel_wifi_info_flutter.dart b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/src/method_channel_wifi_info_flutter.dart index ef390c3cde1e..3c20c961b22a 100644 --- a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/src/method_channel_wifi_info_flutter.dart +++ b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/src/method_channel_wifi_info_flutter.dart @@ -7,6 +7,7 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; +import '../wifi_info_flutter_platform_interface.dart'; import '../wifi_info_flutter_platform_interface.dart'; /// An implementation of [WifiInfoFlutterPlatform] that uses method channels. @@ -17,17 +18,17 @@ class MethodChannelWifiInfoFlutter extends WifiInfoFlutterPlatform { MethodChannel('plugins.flutter.io/wifi_info_flutter'); @override - Future getWifiName() async { + Future getWifiName() async { return methodChannel.invokeMethod('wifiName'); } @override - Future getWifiBSSID() { + Future getWifiBSSID() { return methodChannel.invokeMethod('wifiBSSID'); } @override - Future getWifiIP() { + Future getWifiIP() { return methodChannel.invokeMethod('wifiIPAddress'); } @@ -50,7 +51,7 @@ class MethodChannelWifiInfoFlutter extends WifiInfoFlutterPlatform { } /// Convert a String to a LocationAuthorizationStatus value. -LocationAuthorizationStatus _parseLocationAuthorizationStatus(String result) { +LocationAuthorizationStatus _parseLocationAuthorizationStatus(String? result) { return LocationAuthorizationStatus.values.firstWhere( (LocationAuthorizationStatus status) => result == describeEnum(status), orElse: () => LocationAuthorizationStatus.unknown, diff --git a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/wifi_info_flutter_platform_interface.dart b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/wifi_info_flutter_platform_interface.dart index 85034b2cbbff..5115af7e56eb 100644 --- a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/wifi_info_flutter_platform_interface.dart +++ b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/wifi_info_flutter_platform_interface.dart @@ -43,17 +43,17 @@ abstract class WifiInfoFlutterPlatform extends PlatformInterface { } /// Obtains the wifi name (SSID) of the connected network - Future getWifiName() { + Future getWifiName() { throw UnimplementedError('getWifiName() has not been implemented.'); } /// Obtains the wifi BSSID of the connected network. - Future getWifiBSSID() { + Future getWifiBSSID() { throw UnimplementedError('getWifiBSSID() has not been implemented.'); } /// Obtains the IP address of the connected wifi network - Future getWifiIP() { + Future getWifiIP() { throw UnimplementedError('getWifiIP() has not been implemented.'); } diff --git a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/pubspec.yaml index 62bffd0eeeb3..2cfcbb4ecf7f 100644 --- a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/pubspec.yaml +++ b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/pubspec.yaml @@ -1,20 +1,20 @@ name: wifi_info_flutter_platform_interface description: A common platform interface for the wifi_info_flutter plugin. -version: 1.0.1 +version: 2.0.0-nullsafety # NOTE: We strongly prefer non-breaking changes, even at the expense of a # less-clean API. See https://flutter.dev/go/platform-interface-breaking-changes homepage: https://github.com/flutter/plugins/tree/master/packages/wifi_info_flutter/wifi_info_flutter_platform_interface environment: - sdk: ">=2.7.0 <3.0.0" + sdk: ">=2.12.0-0 <3.0.0" flutter: ">=1.17.0" dependencies: - plugin_platform_interface: ^1.0.3 + plugin_platform_interface: ^1.1.0-nullsafety.1 flutter: sdk: flutter dev_dependencies: - pedantic: ^1.9.2 + pedantic: ^1.10.0-nullsafety.3 flutter_test: sdk: flutter diff --git a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/test/method_channel_wifi_info_flutter_test.dart b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/test/method_channel_wifi_info_flutter_test.dart index b48b2c4110bb..33733170c9fb 100644 --- a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/test/method_channel_wifi_info_flutter_test.dart +++ b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/test/method_channel_wifi_info_flutter_test.dart @@ -12,7 +12,7 @@ void main() { group('$MethodChannelWifiInfoFlutter', () { final List log = []; - MethodChannelWifiInfoFlutter methodChannelWifiInfoFlutter; + late MethodChannelWifiInfoFlutter methodChannelWifiInfoFlutter; setUp(() async { methodChannelWifiInfoFlutter = MethodChannelWifiInfoFlutter(); @@ -39,7 +39,7 @@ void main() { }); test('getWifiName', () async { - final String result = await methodChannelWifiInfoFlutter.getWifiName(); + final String? result = await methodChannelWifiInfoFlutter.getWifiName(); expect(result, '1337wifi'); expect( log, @@ -53,7 +53,7 @@ void main() { }); test('getWifiBSSID', () async { - final String result = await methodChannelWifiInfoFlutter.getWifiBSSID(); + final String? result = await methodChannelWifiInfoFlutter.getWifiBSSID(); expect(result, 'c0:ff:33:c0:d3:55'); expect( log, @@ -67,7 +67,7 @@ void main() { }); test('getWifiIP', () async { - final String result = await methodChannelWifiInfoFlutter.getWifiIP(); + final String? result = await methodChannelWifiInfoFlutter.getWifiIP(); expect(result, '127.0.0.1'); expect( log, From 676aef4072f01af5a2b2714b9d8997ebb3f09435 Mon Sep 17 00:00:00 2001 From: Maurice Parrish Date: Thu, 14 Jan 2021 15:10:42 -0500 Subject: [PATCH 2/3] use min dependencies and remove duplicate import --- .../lib/src/method_channel_wifi_info_flutter.dart | 1 - .../wifi_info_flutter_platform_interface/pubspec.yaml | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/src/method_channel_wifi_info_flutter.dart b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/src/method_channel_wifi_info_flutter.dart index 3c20c961b22a..ba422ecd7565 100644 --- a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/src/method_channel_wifi_info_flutter.dart +++ b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/lib/src/method_channel_wifi_info_flutter.dart @@ -7,7 +7,6 @@ import 'dart:async'; import 'package:flutter/foundation.dart'; import 'package:flutter/services.dart'; -import '../wifi_info_flutter_platform_interface.dart'; import '../wifi_info_flutter_platform_interface.dart'; /// An implementation of [WifiInfoFlutterPlatform] that uses method channels. diff --git a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/pubspec.yaml index 2cfcbb4ecf7f..1d830f0af5f6 100644 --- a/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/pubspec.yaml +++ b/packages/wifi_info_flutter/wifi_info_flutter_platform_interface/pubspec.yaml @@ -10,11 +10,11 @@ environment: flutter: ">=1.17.0" dependencies: - plugin_platform_interface: ^1.1.0-nullsafety.1 + plugin_platform_interface: ^1.1.0-nullsafety flutter: sdk: flutter dev_dependencies: - pedantic: ^1.10.0-nullsafety.3 + pedantic: ^1.10.0-nullsafety flutter_test: sdk: flutter From 2ed6d8912a12863238e3f509ec4eb4bb7dda7498 Mon Sep 17 00:00:00 2001 From: Maurice Parrish Date: Thu, 14 Jan 2021 15:13:27 -0500 Subject: [PATCH 3/3] add to nnbd list --- script/nnbd_plugins.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/script/nnbd_plugins.sh b/script/nnbd_plugins.sh index 7bc5ac35a3a5..a66c90ce8894 100644 --- a/script/nnbd_plugins.sh +++ b/script/nnbd_plugins.sh @@ -19,6 +19,7 @@ readonly NNBD_PLUGINS_LIST=( "url_launcher" "video_player" "webview_flutter" + "wifi_info_flutter" ) export EXCLUDED_PLUGINS_FROM_STABLE=$(IFS=, ; echo "${NNBD_PLUGINS_LIST[*]}")