[firebase_core] Put the 'dart:io' import behind a configurable import (…

…firebase#1609) * [firebase_core] Put the 'dart:io' import behind a configurable import This should make the plugin register as supporting Web on pub.dev * dartfmt * Remove unnecessary library directive
DEVSOG12 · Dec 11, 2019 · c8debc9 · c8debc9
1 parent 68eb9fa
commit c8debc9
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 14 deletions.
diff --git a/packages/firebase_core/firebase_core/CHANGELOG.md b/packages/firebase_core/firebase_core/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 0.4.3+1
+
+* Move `Platform.isIOS` check behind a configurable import so that pub.dev registers
+  this as a Web plugin.
+
 ## 0.4.3
 
 * Enable the `web` implementation by default.

diff --git a/packages/firebase_core/firebase_core/lib/firebase_core.dart b/packages/firebase_core/firebase_core/lib/firebase_core.dart
@@ -2,16 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-library firebase_core;
-
-import 'dart:async';
-import 'dart:io' show Platform;
-
-import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
-import 'package:flutter/foundation.dart' show kIsWeb;
-import 'package:meta/meta.dart';
-
 export 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart'
     show FirebaseOptions;
 
-part 'src/firebase_app.dart';
+export 'src/firebase_app.dart';
diff --git a/packages/firebase_core/firebase_core/lib/src/default_app_name.dart b/packages/firebase_core/firebase_core/lib/src/default_app_name.dart
@@ -0,0 +1,6 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+/// The default app name.
+const String firebaseDefaultAppName = '[DEFAULT]';
diff --git a/packages/firebase_core/firebase_core/lib/src/default_app_name_io.dart b/packages/firebase_core/firebase_core/lib/src/default_app_name_io.dart
@@ -0,0 +1,9 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+import 'dart:io';
+
+/// The default app name.
+final String firebaseDefaultAppName =
+    Platform.isIOS ? '__FIRAPP_DEFAULT' : '[DEFAULT]';
diff --git a/packages/firebase_core/firebase_core/lib/src/firebase_app.dart b/packages/firebase_core/firebase_core/lib/src/firebase_app.dart
@@ -2,7 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-part of firebase_core;
+import 'dart:async';
+
+import 'package:firebase_core_platform_interface/firebase_core_platform_interface.dart';
+import 'package:meta/meta.dart';
+
+import 'default_app_name.dart' if (dart.library.io) 'default_app_name_io.dart';
 
 class FirebaseApp {
   // TODO(jackson): We could assert here that an app with this name was configured previously.
@@ -11,8 +16,7 @@ class FirebaseApp {
   /// The name of this app.
   final String name;
 
-  static final String defaultAppName =
-      (!kIsWeb && Platform.isIOS) ? '__FIRAPP_DEFAULT' : '[DEFAULT]';
+  static final String defaultAppName = firebaseDefaultAppName;
 
   /// A copy of the options for this app. These are non-modifiable.
   ///

diff --git a/packages/firebase_core/firebase_core/pubspec.yaml b/packages/firebase_core/firebase_core/pubspec.yaml
@@ -2,7 +2,7 @@ name: firebase_core
 description: Flutter plugin for Firebase Core, enabling connecting to multiple
   Firebase apps.
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/firebase_core/firebase_core
-version: 0.4.3
+version: 0.4.3+1
 
 flutter:
   plugin: