refactor(firebase_dart_flutter): upgrade platform_info to ^5.0.0

Author: rbellens

packages/firebase_dart_flutter/lib/firebase_dart_flutter.dart

@@ -54,41 +54,40 @@ class FirebaseDartFlutter {
     if (kIsWeb) {
       return Platform.web(
         currentUrl: Uri.base.toString(),
-        isMobile: p.isMobile,
+        isMobile: p.mobile,
         isOnline: true,
       );
     }
 
-    switch (p.operatingSystem) {
-      case platform_info.OperatingSystem.android:
-        var i = await PackageInfo.fromPlatform();
-        return Platform.android(
-          isOnline: true,
-          packageId: i.packageName,
-          sha1Cert: await _channel.invokeMethod('getSha1Cert'),
-        );
-      case platform_info.OperatingSystem.iOS:
-        var i = await PackageInfo.fromPlatform();
-        return Platform.ios(
-          isOnline: true,
-          appId: i.packageName,
-        );
-      case platform_info.OperatingSystem.macOS:
-        var i = await PackageInfo.fromPlatform();
-        return Platform.macos(
-          isOnline: true,
-          appId: i.packageName,
-        );
-      case platform_info.OperatingSystem.linux:
-        return Platform.linux(
-          isOnline: true,
-        );
-      case platform_info.OperatingSystem.windows:
-        return Platform.windows(
-          isOnline: true,
-        );
-      default:
-        throw UnsupportedError('Unsupported platform ${p.operatingSystem}');
+    if (p.android) {
+      var i = await PackageInfo.fromPlatform();
+      return Platform.android(
+        isOnline: true,
+        packageId: i.packageName,
+        sha1Cert: await _channel.invokeMethod('getSha1Cert'),
+      );
+    } else if (p.iOS) {
+      var i = await PackageInfo.fromPlatform();
+      return Platform.ios(
+        isOnline: true,
+        appId: i.packageName,
+      );
+    } else if (p.macOS) {
+      var i = await PackageInfo.fromPlatform();
+      return Platform.macos(
+        isOnline: true,
+        appId: i.packageName,
+      );
+    } else if (p.linux) {
+      return Platform.linux(
+        isOnline: true,
+      );
+    } else if (p.windows) {
+      return Platform.windows(
+        isOnline: true,
+      );
+    } else {
+      throw UnsupportedError('Unsupported platform ${p.operatingSystem}');
     }
   }
 }

packages/firebase_dart_flutter/lib/src/auth_handlers.dart

@@ -80,7 +80,7 @@ class AppleAuthHandler extends DirectAuthHandler<OAuthProvider> {
   @override
   Future<AuthCredential?> directSignIn(
       FirebaseApp app, OAuthProvider provider) async {
-    if (!platform_info.Platform.instance.isIOS) {
+    if (!platform_info.Platform.instance.iOS) {
       return null;
     }
     final credential = await SignInWithApple.getAppleIDCredential(
@@ -106,7 +106,7 @@ class FlutterAuthHandler extends FirebaseAppAuthHandler {
   Future<AuthCredential?> getSignInResult(FirebaseApp app) async {
     if (!kIsWeb) {
       return _lastAuthResult ??= Future(() async {
-        var v = await (platform_info.Platform.instance.isAndroid
+        var v = await (platform_info.Platform.instance.android
             ? _getResult('getAuthResult')
             : _getDeepLinkResult());
         _lastAuthResult = null;
@@ -160,14 +160,14 @@ class FlutterApplicationVerifier extends BaseApplicationVerifier {
   Future<String>? _lastRecaptchaResult;
 
   late final Future<bool> _isGooglePlayServicesAvailable = Future(() async {
-    if (kIsWeb || !platform_info.Platform.instance.isAndroid) return false;
+    if (kIsWeb || !platform_info.Platform.instance.android) return false;
     return await _channel.invokeMethod<bool>('isGooglePlayServicesAvailable') ??
         false;
   });
 
   @override
   Future<String> getVerifyResult(FirebaseApp app) {
-    if (!kIsWeb && platform_info.Platform.instance.isAndroid) {
+    if (!kIsWeb && platform_info.Platform.instance.android) {
       return _lastRecaptchaResult ??= Future(() async {
         var v = await _getResult('getVerifyResult');
         _lastRecaptchaResult = null;
@@ -260,15 +260,15 @@ class AndroidSmsRetriever extends SmsRetriever {
 
   @override
   Future<String?> getAppSignatureHash() {
-    if (!kIsWeb && platform_info.Platform.instance.isAndroid) {
+    if (!kIsWeb && platform_info.Platform.instance.android) {
       return _appSignatureHash;
     }
     return Future.value();
   }
 
   @override
   Future<String?> retrieveSms() {
-    if (!kIsWeb && platform_info.Platform.instance.isAndroid) {
+    if (!kIsWeb && platform_info.Platform.instance.android) {
       return Future(() async {
         var v = (await _channel.invokeMethod<String>('retrieveSms'))!;
         return v;

packages/firebase_dart_flutter/pubspec.yaml

@@ -11,7 +11,7 @@ dependencies:
   flutter:
     sdk: flutter
   firebase_dart: ^1.2.1
-  platform_info: ^3.0.0
+  platform_info: ^5.0.0
   path_provider: ^2.0.0
   hive: ^2.0.0
   package_info: ^2.0.0