From 747f8c1807a1840325e90ecd87922a64d3bb2cf6 Mon Sep 17 00:00:00 2001
From: Mehmet Fidanboylu <mehmetf@google.com>
Date: Wed, 8 Jul 2020 22:23:10 -0700
Subject: [PATCH] Remove universal_platform dependency and use foundation
 functions

---
 .../lib/firebase_core_platform_interface.dart               | 2 +-
 .../lib/src/firebase_core_exceptions.dart                   | 6 +++---
 .../firebase_core_platform_interface/pubspec.yaml           | 1 -
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/firebase_core_platform_interface.dart b/packages/firebase_core/firebase_core_platform_interface/lib/firebase_core_platform_interface.dart
index 71940fd02d33..d393da3eba9f 100644
--- a/packages/firebase_core/firebase_core_platform_interface/lib/firebase_core_platform_interface.dart
+++ b/packages/firebase_core/firebase_core_platform_interface/lib/firebase_core_platform_interface.dart
@@ -8,11 +8,11 @@ library firebase_core_platform_interface;
 import 'dart:async';
 
 import 'package:flutter/cupertino.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/services.dart';
 import 'package:meta/meta.dart' show required;
 import 'package:plugin_platform_interface/plugin_platform_interface.dart';
 import 'package:quiver/core.dart';
-import 'package:universal_platform/universal_platform.dart';
 
 part 'src/firebase_core_exceptions.dart';
 
diff --git a/packages/firebase_core/firebase_core_platform_interface/lib/src/firebase_core_exceptions.dart b/packages/firebase_core/firebase_core_platform_interface/lib/src/firebase_core_exceptions.dart
index 33baafdb7033..17126da53742 100644
--- a/packages/firebase_core/firebase_core_platform_interface/lib/src/firebase_core_exceptions.dart
+++ b/packages/firebase_core/firebase_core_platform_interface/lib/src/firebase_core_exceptions.dart
@@ -37,19 +37,19 @@ FirebaseException noDefaultAppInitialization() {
 FirebaseException coreNotInitialized() {
   String message;
 
-  if (UniversalPlatform.isWeb) {
+  if (kIsWeb) {
     message =
         '''Firebase has not been correctly initialized. Have you added the Firebase import scripts to your index.html file? 
     
     View the Web Installation documentation for more information: https://firebaseextended.github.io/flutterfire/docs/installation/web
     ''';
-  } else if (UniversalPlatform.isAndroid) {
+  } else if (defaultTargetPlatform == TargetPlatform.android) {
     message =
         '''Firebase has not been correctly initialized. Have you added the "google-services.json" file to the project? 
     
     View the Android Installation documentation for more information: https://firebaseextended.github.io/flutterfire/docs/installation/android
     ''';
-  } else if (UniversalPlatform.isIOS) {
+  } else if (defaultTargetPlatform == TargetPlatform.iOS) {
     message =
         '''Firebase has not been correctly initialized. Have you added the "GoogleService-Info.plist" file to the project? 
     
diff --git a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml
index 26e1757d424b..3289e03ea196 100644
--- a/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml
+++ b/packages/firebase_core/firebase_core_platform_interface/pubspec.yaml
@@ -11,7 +11,6 @@ dependencies:
   meta: ^1.1.8
   plugin_platform_interface: ^1.0.2
   quiver: ">=2.0.0 <3.0.0"
-  universal_platform: ^0.1.3
 
 dev_dependencies:
   pedantic: ^1.8.0