From a2ae07bc7549b80af6c3333703ad0e5c9b475228 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 29 Dec 2020 23:35:20 -0500
Subject: [PATCH 1/8] migrate to null safety

---
 .../wifi_info_flutter/CHANGELOG.md            |  4 +++
 .../wifi_info_flutter/example/lib/main.dart   | 25 ++++++++++---------
 .../wifi_info_flutter/example/pubspec.yaml    |  6 ++---
 .../integration_test/wifi_info_test.dart      |  2 ++
 .../test_driver/test/integration_test.dart    |  2 ++
 .../integration_test/wifi_info_test.dart      |  2 ++
 .../lib/wifi_info_flutter.dart                | 19 ++++++--------
 .../wifi_info_flutter/pubspec.yaml            | 14 +++++++----
 8 files changed, 42 insertions(+), 32 deletions(-)

diff --git a/packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md b/packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md
index 5c3ea32e8ef9..8aac67b52530 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md
+++ b/packages/wifi_info_flutter/wifi_info_flutter/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.0-nullsafety
+
+* Migrate to null safety.
+
 ## 1.0.3
 
 * Fix README example.
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/lib/main.dart b/packages/wifi_info_flutter/wifi_info_flutter/example/lib/main.dart
index 17a9e76ad946..056ceb91ae2c 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/lib/main.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/lib/main.dart
@@ -42,9 +42,9 @@ class MyApp extends StatelessWidget {
 }
 
 class MyHomePage extends StatefulWidget {
-  MyHomePage({Key key, this.title}) : super(key: key);
+  MyHomePage({Key? key, this.title}) : super(key: key);
 
-  final String title;
+  final String? title;
 
   @override
   _MyHomePageState createState() => _MyHomePageState();
@@ -54,7 +54,7 @@ class _MyHomePageState extends State<MyHomePage> {
   String _connectionStatus = 'Unknown';
   final Connectivity _connectivity = Connectivity();
   final WifiInfo _wifiInfo = WifiInfo();
-  StreamSubscription<ConnectivityResult> _connectivitySubscription;
+  late StreamSubscription<ConnectivityResult> _connectivitySubscription;
 
   @override
   void initState() {
@@ -72,12 +72,13 @@ class _MyHomePageState extends State<MyHomePage> {
 
   // Platform messages are asynchronous, so we initialize in an async method.
   Future<void> initConnectivity() async {
-    ConnectivityResult result;
+    late final ConnectivityResult result;
     // Platform messages may fail, so we use a try/catch PlatformException.
     try {
       result = await _connectivity.checkConnectivity();
     } on PlatformException catch (e) {
       print(e.toString());
+      return;
     }
 
     // If the widget was removed from the tree while the asynchronous platform
@@ -103,7 +104,7 @@ class _MyHomePageState extends State<MyHomePage> {
   Future<void> _updateConnectionStatus(ConnectivityResult result) async {
     switch (result) {
       case ConnectivityResult.wifi:
-        String wifiName, wifiBSSID, wifiIP;
+        String? wifiName, wifiBSSID, wifiIP;
 
         try {
           if (!kIsWeb && Platform.isIOS) {
@@ -114,12 +115,12 @@ class _MyHomePageState extends State<MyHomePage> {
             }
             if (status == LocationAuthorizationStatus.authorizedAlways ||
                 status == LocationAuthorizationStatus.authorizedWhenInUse) {
-              wifiName = await _connectivity.getWifiName();
+              wifiName = await _wifiInfo.getWifiName();
             } else {
-              wifiName = await _connectivity.getWifiName();
+              wifiName = await _wifiInfo.getWifiName();
             }
           } else {
-            wifiName = await _connectivity.getWifiName();
+            wifiName = await _wifiInfo.getWifiName();
           }
         } on PlatformException catch (e) {
           print(e.toString());
@@ -135,12 +136,12 @@ class _MyHomePageState extends State<MyHomePage> {
             }
             if (status == LocationAuthorizationStatus.authorizedAlways ||
                 status == LocationAuthorizationStatus.authorizedWhenInUse) {
-              wifiBSSID = await _connectivity.getWifiBSSID();
+              wifiBSSID = await _wifiInfo.getWifiBSSID();
             } else {
-              wifiBSSID = await _connectivity.getWifiBSSID();
+              wifiBSSID = await _wifiInfo.getWifiBSSID();
             }
           } else {
-            wifiBSSID = await _connectivity.getWifiBSSID();
+            wifiBSSID = await _wifiInfo.getWifiBSSID();
           }
         } on PlatformException catch (e) {
           print(e.toString());
@@ -148,7 +149,7 @@ class _MyHomePageState extends State<MyHomePage> {
         }
 
         try {
-          wifiIP = await _connectivity.getWifiIP();
+          wifiIP = await _wifiInfo.getWifiIP();
         } on PlatformException catch (e) {
           print(e.toString());
           wifiIP = "Failed to get Wifi IP";
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
index 7ebc1573ddcf..52ed7585311a 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
@@ -3,15 +3,15 @@ description: Demonstrates how to use the wifi_info_flutter plugin.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
 
 dependencies:
-  connectivity: 0.4.9+3
+  connectivity: 3.0.0-nullsafety.1
   flutter:
     sdk: flutter
   wifi_info_flutter:
     path: ../
-  cupertino_icons: ^1.0.0
+  cupertino_icons: ^1.0.2
 
 dev_dependencies:
   integration_test:
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
index 103dc54a1eaa..4760b88d9019 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// @dart = 2.9
+
 import 'dart:io';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
index 8a77ec87bbac..67e54302ad5f 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// @dart = 2.9
+
 import 'dart:convert';
 import 'dart:io';
 import 'package:flutter_driver/flutter_driver.dart';
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/integration_test/wifi_info_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/integration_test/wifi_info_test.dart
index 103dc54a1eaa..4760b88d9019 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/integration_test/wifi_info_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/integration_test/wifi_info_test.dart
@@ -2,6 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+// @dart = 2.9
+
 import 'dart:io';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/lib/wifi_info_flutter.dart b/packages/wifi_info_flutter/wifi_info_flutter/lib/wifi_info_flutter.dart
index 1183bf6c74bf..a2a69d161f5a 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/lib/wifi_info_flutter.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/lib/wifi_info_flutter.dart
@@ -13,19 +13,14 @@ export 'package:wifi_info_flutter_platform_interface/wifi_info_flutter_platform_
 
 /// Checks WI-FI status and more.
 class WifiInfo {
+  WifiInfo._();
+
   /// Constructs a singleton instance of [WifiInfo].
   ///
   /// [WifiInfo] is designed to work as a singleton.
-  factory WifiInfo() {
-    if (_singleton == null) {
-      _singleton = WifiInfo._();
-    }
-    return _singleton;
-  }
-
-  WifiInfo._();
+  factory WifiInfo() => _singleton;
 
-  static WifiInfo _singleton;
+  static final WifiInfo _singleton = WifiInfo._();
 
   static WifiInfoFlutterPlatform get _platform =>
       WifiInfoFlutterPlatform.instance;
@@ -36,7 +31,7 @@ class WifiInfo {
   ///
   /// From android 8.0 onwards the GPS must be ON (high accuracy)
   /// in order to be able to obtain the SSID.
-  Future<String> getWifiName() {
+  Future<String?> getWifiName() {
     return _platform.getWifiName();
   }
 
@@ -46,12 +41,12 @@ class WifiInfo {
   ///
   /// From Android 8.0 onwards the GPS must be ON (high accuracy)
   /// in order to be able to obtain the BSSID.
-  Future<String> getWifiBSSID() {
+  Future<String?> getWifiBSSID() {
     return _platform.getWifiBSSID();
   }
 
   /// Obtains the IP address of the connected wifi network
-  Future<String> getWifiIP() {
+  Future<String?> getWifiIP() {
     return _platform.getWifiIP();
   }
 
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
index 4f5ecafb50b4..8dd20bf6092d 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
@@ -1,20 +1,24 @@
 name: wifi_info_flutter
 description: A new flutter plugin project.
-version: 1.0.3
+version: 2.0.0-nullsafety
 homepage: https://github.com/flutter/plugins/tree/master/packages/wifi_info_flutter/wifi_info_flutter
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: ">=2.12.0-0 <3.0.0"
   flutter: ">=1.20.0"
 
 dependencies:
   flutter:
     sdk: flutter
-  wifi_info_flutter_platform_interface: ^1.0.0
+  wifi_info_flutter_platform_interface:
+    git:
+      url: git@github.com:bparrishMines/plugins.git
+      ref: wifi_info_flutter_platform_interface_nnbd
+      path: packages/wifi_info_flutter/wifi_info_flutter_platform_interface
 
 dev_dependencies:
-  mockito: ^4.1.1
-  plugin_platform_interface: ^1.0.0
+  mockito: ^5.0.0-nullsafety.0
+  plugin_platform_interface: ^1.1.0-nullsafety.1
   integration_test:
     path: ../../integration_test
   flutter_test:

From 911d6c5cb47e035b35aa2d00c95ca012a4c2de20 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 14 Jan 2021 15:50:58 -0500
Subject: [PATCH 2/8] null safe tests and min dependency

---
 .../wifi_info_flutter/example/pubspec.yaml             |  4 ++--
 .../wifi_info_flutter/wifi_info_flutter/pubspec.yaml   |  2 +-
 .../wifi_info_flutter/test/wifi_info_flutter_test.dart | 10 ++++------
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
index 52ed7585311a..bf9ae89c1b97 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
@@ -6,12 +6,12 @@ environment:
   sdk: ">=2.12.0-0 <3.0.0"
 
 dependencies:
-  connectivity: 3.0.0-nullsafety.1
+  connectivity: 3.0.0-nullsafety
   flutter:
     sdk: flutter
   wifi_info_flutter:
     path: ../
-  cupertino_icons: ^1.0.2
+  cupertino_icons: ^1.0.1
 
 dev_dependencies:
   integration_test:
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
index 8dd20bf6092d..31888bac5853 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
@@ -18,7 +18,7 @@ dependencies:
 
 dev_dependencies:
   mockito: ^5.0.0-nullsafety.0
-  plugin_platform_interface: ^1.1.0-nullsafety.1
+  plugin_platform_interface: ^1.1.0-nullsafety
   integration_test:
     path: ../../integration_test
   flutter_test:
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/test/wifi_info_flutter_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/test/wifi_info_flutter_test.dart
index a3a55170bce5..6c9abd860e56 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/test/wifi_info_flutter_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/test/wifi_info_flutter_test.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.8
-
 import 'package:wifi_info_flutter/wifi_info_flutter.dart';
 import 'package:wifi_info_flutter_platform_interface/wifi_info_flutter_platform_interface.dart';
 import 'package:flutter_test/flutter_test.dart';
@@ -20,7 +18,7 @@ const LocationAuthorizationStatus kGetLocationResult =
 
 void main() {
   group('$WifiInfo', () {
-    WifiInfo wifiInfo;
+    late WifiInfo wifiInfo;
     MockWifiInfoFlutterPlatform fakePlatform;
 
     setUp(() async {
@@ -30,17 +28,17 @@ void main() {
     });
 
     test('getWifiName', () async {
-      String result = await wifiInfo.getWifiName();
+      String? result = await wifiInfo.getWifiName();
       expect(result, kWifiNameResult);
     });
 
     test('getWifiBSSID', () async {
-      String result = await wifiInfo.getWifiBSSID();
+      String? result = await wifiInfo.getWifiBSSID();
       expect(result, kWifiBSSIDResult);
     });
 
     test('getWifiIP', () async {
-      String result = await wifiInfo.getWifiIP();
+      String? result = await wifiInfo.getWifiIP();
       expect(result, kWifiIpAddressResult);
     });
 

From baab15b41fd546da4ee73024bd7b09427824fb93 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 14 Jan 2021 15:51:26 -0500
Subject: [PATCH 3/8] 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 0cab28abe2ab..e4f796e0d661 100644
--- a/script/nnbd_plugins.sh
+++ b/script/nnbd_plugins.sh
@@ -18,6 +18,7 @@ readonly NNBD_PLUGINS_LIST=(
   "url_launcher"
   "video_player"
   "webview_flutter"
+  "wifi_info_flutter"
 )
 
 export EXCLUDED_PLUGINS_FROM_STABLE=$(IFS=, ; echo "${NNBD_PLUGINS_LIST[*]}")

From e5578ce11acb8dcd6050662abaf8397b2b0ae27e Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 9 Feb 2021 10:47:18 -0800
Subject: [PATCH 4/8] revert example

---
 .../wifi_info_flutter/example/lib/main.dart           | 11 +++++------
 .../wifi_info_flutter/example/pubspec.yaml            |  6 +++---
 .../test_driver/integration_test/wifi_info_test.dart  |  2 --
 .../example/test_driver/test/integration_test.dart    |  2 --
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/lib/main.dart b/packages/wifi_info_flutter/wifi_info_flutter/example/lib/main.dart
index 056ceb91ae2c..8c64c5d9a421 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/lib/main.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/lib/main.dart
@@ -42,9 +42,9 @@ class MyApp extends StatelessWidget {
 }
 
 class MyHomePage extends StatefulWidget {
-  MyHomePage({Key? key, this.title}) : super(key: key);
+  MyHomePage({Key key, this.title}) : super(key: key);
 
-  final String? title;
+  final String title;
 
   @override
   _MyHomePageState createState() => _MyHomePageState();
@@ -54,7 +54,7 @@ class _MyHomePageState extends State<MyHomePage> {
   String _connectionStatus = 'Unknown';
   final Connectivity _connectivity = Connectivity();
   final WifiInfo _wifiInfo = WifiInfo();
-  late StreamSubscription<ConnectivityResult> _connectivitySubscription;
+  StreamSubscription<ConnectivityResult> _connectivitySubscription;
 
   @override
   void initState() {
@@ -72,13 +72,12 @@ class _MyHomePageState extends State<MyHomePage> {
 
   // Platform messages are asynchronous, so we initialize in an async method.
   Future<void> initConnectivity() async {
-    late final ConnectivityResult result;
+    ConnectivityResult result;
     // Platform messages may fail, so we use a try/catch PlatformException.
     try {
       result = await _connectivity.checkConnectivity();
     } on PlatformException catch (e) {
       print(e.toString());
-      return;
     }
 
     // If the widget was removed from the tree while the asynchronous platform
@@ -104,7 +103,7 @@ class _MyHomePageState extends State<MyHomePage> {
   Future<void> _updateConnectionStatus(ConnectivityResult result) async {
     switch (result) {
       case ConnectivityResult.wifi:
-        String? wifiName, wifiBSSID, wifiIP;
+        String wifiName, wifiBSSID, wifiIP;
 
         try {
           if (!kIsWeb && Platform.isIOS) {
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
index bf9ae89c1b97..7ebc1573ddcf 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/pubspec.yaml
@@ -3,15 +3,15 @@ description: Demonstrates how to use the wifi_info_flutter plugin.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.12.0-0 <3.0.0"
+  sdk: ">=2.7.0 <3.0.0"
 
 dependencies:
-  connectivity: 3.0.0-nullsafety
+  connectivity: 0.4.9+3
   flutter:
     sdk: flutter
   wifi_info_flutter:
     path: ../
-  cupertino_icons: ^1.0.1
+  cupertino_icons: ^1.0.0
 
 dev_dependencies:
   integration_test:
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
index 4760b88d9019..103dc54a1eaa 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/integration_test/wifi_info_test.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'dart:io';
 import 'package:integration_test/integration_test.dart';
 import 'package:flutter_test/flutter_test.dart';
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
index 67e54302ad5f..8a77ec87bbac 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/test_driver/test/integration_test.dart
@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// @dart = 2.9
-
 import 'dart:convert';
 import 'dart:io';
 import 'package:flutter_driver/flutter_driver.dart';

From 29f728888fc15e75852e3e9fb2cbc20952f01da5 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 9 Feb 2021 10:54:35 -0800
Subject: [PATCH 5/8] remove mockito dependency and use nullsafe dep

---
 .../example/ios/Flutter/Debug.xcconfig          |  1 +
 .../example/ios/Flutter/Release.xcconfig        |  1 +
 .../wifi_info_flutter/pubspec.yaml              |  7 +------
 .../test/wifi_info_flutter_test.dart            | 17 +++++++++--------
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Debug.xcconfig b/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Debug.xcconfig
index e8efba114687..b2f5fae9c254 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Debug.xcconfig
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Debug.xcconfig
@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Release.xcconfig b/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Release.xcconfig
index 399e9340e6f6..88c29144c836 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Release.xcconfig
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Release.xcconfig
@@ -1,2 +1,3 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
index 31888bac5853..23ddbb0d5c33 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
@@ -10,14 +10,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  wifi_info_flutter_platform_interface:
-    git:
-      url: git@github.com:bparrishMines/plugins.git
-      ref: wifi_info_flutter_platform_interface_nnbd
-      path: packages/wifi_info_flutter/wifi_info_flutter_platform_interface
+  wifi_info_flutter_platform_interface: 2.0.0-nullsafety
 
 dev_dependencies:
-  mockito: ^5.0.0-nullsafety.0
   plugin_platform_interface: ^1.1.0-nullsafety
   integration_test:
     path: ../../integration_test
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/test/wifi_info_flutter_test.dart b/packages/wifi_info_flutter/wifi_info_flutter/test/wifi_info_flutter_test.dart
index 6c9abd860e56..19e84f696f7f 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/test/wifi_info_flutter_test.dart
+++ b/packages/wifi_info_flutter/wifi_info_flutter/test/wifi_info_flutter_test.dart
@@ -5,8 +5,6 @@
 import 'package:wifi_info_flutter/wifi_info_flutter.dart';
 import 'package:wifi_info_flutter_platform_interface/wifi_info_flutter_platform_interface.dart';
 import 'package:flutter_test/flutter_test.dart';
-import 'package:plugin_platform_interface/plugin_platform_interface.dart';
-import 'package:mockito/mockito.dart';
 
 const String kWifiNameResult = '1337wifi';
 const String kWifiBSSIDResult = 'c0:ff:33:c0:d3:55';
@@ -56,27 +54,30 @@ void main() {
   });
 }
 
-class MockWifiInfoFlutterPlatform extends Mock
-    with MockPlatformInterfaceMixin
-    implements WifiInfoFlutterPlatform {
-  Future<String> getWifiName() async {
+class MockWifiInfoFlutterPlatform extends WifiInfoFlutterPlatform {
+  @override
+  Future<String?> getWifiName() async {
     return kWifiNameResult;
   }
 
-  Future<String> getWifiBSSID() async {
+  @override
+  Future<String?> getWifiBSSID() async {
     return kWifiBSSIDResult;
   }
 
-  Future<String> getWifiIP() async {
+  @override
+  Future<String?> getWifiIP() async {
     return kWifiIpAddressResult;
   }
 
+  @override
   Future<LocationAuthorizationStatus> requestLocationServiceAuthorization({
     bool requestAlwaysLocationUsage = false,
   }) async {
     return kRequestLocationResult;
   }
 
+  @override
   Future<LocationAuthorizationStatus> getLocationServiceAuthorization() async {
     return kGetLocationResult;
   }

From 653524dcbfe295f09feec348637252b0f15bdbdf Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 9 Feb 2021 10:56:57 -0800
Subject: [PATCH 6/8] revert xcconfigs

---
 .../wifi_info_flutter/example/ios/Flutter/Debug.xcconfig         | 1 -
 .../wifi_info_flutter/example/ios/Flutter/Release.xcconfig       | 1 -
 2 files changed, 2 deletions(-)

diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Debug.xcconfig b/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Debug.xcconfig
index b2f5fae9c254..e8efba114687 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Debug.xcconfig
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Debug.xcconfig
@@ -1,3 +1,2 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"
diff --git a/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Release.xcconfig b/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Release.xcconfig
index 88c29144c836..399e9340e6f6 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Release.xcconfig
+++ b/packages/wifi_info_flutter/wifi_info_flutter/example/ios/Flutter/Release.xcconfig
@@ -1,3 +1,2 @@
-#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

From d4fbd765d62e9854664291a79c080ba3af168e39 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Tue, 9 Feb 2021 11:41:14 -0800
Subject: [PATCH 7/8] relax constraint

---
 packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
index 23ddbb0d5c33..62a2f4ed1b87 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
@@ -10,7 +10,7 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  wifi_info_flutter_platform_interface: 2.0.0-nullsafety
+  wifi_info_flutter_platform_interface: ^2.0.0-nullsafety
 
 dev_dependencies:
   plugin_platform_interface: ^1.1.0-nullsafety

From 26506bd856b9ced14375348e30b2b7ddcfba0474 Mon Sep 17 00:00:00 2001
From: Maurice Parrish <bmparr@google.com>
Date: Thu, 11 Feb 2021 09:21:00 -0800
Subject: [PATCH 8/8] remove platform interface dev dependency

---
 packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
index 62a2f4ed1b87..0fbc27866201 100644
--- a/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
+++ b/packages/wifi_info_flutter/wifi_info_flutter/pubspec.yaml
@@ -13,7 +13,6 @@ dependencies:
   wifi_info_flutter_platform_interface: ^2.0.0-nullsafety
 
 dev_dependencies:
-  plugin_platform_interface: ^1.1.0-nullsafety
   integration_test:
     path: ../../integration_test
   flutter_test: