Merge branch 'master' into firebase_auth_macos

Author: cbenhagen

.gitignore

@@ -21,7 +21,6 @@ Pods/
 **/Flutter/flutter_assets/
 ServiceDefinitions.json
 xcuserdata/
-*.xcworkspace
 
 local.properties
 keystore.properties

packages/cloud_firestore/cloud_firestore_web/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.1.0+3
+
+- Removed unit test that was only testing dart-lang behavior.
+
 ## 0.1.0+2
 
 - Update documentation about this package being the endorsed platform for web.

packages/cloud_firestore/cloud_firestore_web/pubspec.yaml

@@ -1,7 +1,7 @@
 name: cloud_firestore_web
 description: The web implementation of cloud_firestore
 homepage: https://github.com/FirebaseExtended/flutterfire/tree/master/packages/cloud_firestore/cloud_firestore_web
-version: 0.1.0+2
+version: 0.1.0+3
 
 flutter:
   plugin:

packages/cloud_firestore/cloud_firestore_web/test/field_value_factory_web_test.dart

@@ -35,15 +35,6 @@ void main() {
       expect(actualDouble.data, isInstanceOf<web.FieldValue>());
     });
 
-    test(
-        "increment throws when attempting to increment something that is not a number",
-        () {
-      expect(() {
-        dynamic malformed = "nope";
-        factory.increment(malformed);
-      }, throwsA(isA<TypeError>()));
-    });
-
     test("serverTimestamp", () {
       final FieldValueWeb actual = factory.serverTimestamp();
       expect(actual.data, isInstanceOf<web.FieldValue>());

packages/firebase_core/firebase_core/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.4.4
+
+* Add macOS support
+
 ## 0.4.3+3
 
 * Fix overrides a deprecated API.

packages/firebase_core/firebase_core/darwin/Classes/FLTFirebaseCorePlugin.m

@@ -0,0 +1,94 @@
+// Copyright 2017 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 "FLTFirebaseCorePlugin.h"
+#import "UserAgent.h"
+
+#import <Firebase/Firebase.h>
+
+static NSDictionary *getDictionaryFromFIROptions(FIROptions *options) {
+  if (!options) {
+    return nil;
+  }
+  return @{
+    @"googleAppID" : options.googleAppID ?: [NSNull null],
+    @"bundleID" : options.bundleID ?: [NSNull null],
+    @"GCMSenderID" : options.GCMSenderID ?: [NSNull null],
+    @"APIKey" : options.APIKey ?: [NSNull null],
+    @"clientID" : options.clientID ?: [NSNull null],
+    @"trackingID" : options.trackingID ?: [NSNull null],
+    @"projectID" : options.projectID ?: [NSNull null],
+    @"androidClientID" : options.androidClientID ?: [NSNull null],
+    @"databaseUrl" : options.databaseURL ?: [NSNull null],
+    @"storageBucket" : options.storageBucket ?: [NSNull null],
+    @"deepLinkURLScheme" : options.deepLinkURLScheme ?: [NSNull null],
+  };
+}
+
+static NSDictionary *getDictionaryFromFIRApp(FIRApp *app) {
+  if (!app) {
+    return nil;
+  }
+  return @{@"name" : app.name, @"options" : getDictionaryFromFIROptions(app.options)};
+}
+
+@implementation FLTFirebaseCorePlugin
++ (void)registerWithRegistrar:(NSObject<FlutterPluginRegistrar> *)registrar {
+  FlutterMethodChannel *channel =
+      [FlutterMethodChannel methodChannelWithName:@"plugins.flutter.io/firebase_core"
+                                  binaryMessenger:[registrar messenger]];
+  FLTFirebaseCorePlugin *instance = [[FLTFirebaseCorePlugin alloc] init];
+  [registrar addMethodCallDelegate:instance channel:channel];
+
+  SEL sel = NSSelectorFromString(@"registerLibrary:withVersion:");
+  if ([FIRApp respondsToSelector:sel]) {
+    [FIRApp performSelector:sel withObject:LIBRARY_NAME withObject:LIBRARY_VERSION];
+  }
+}
+
+- (void)handleMethodCall:(FlutterMethodCall *)call result:(FlutterResult)result {
+  if ([@"FirebaseApp#configure" isEqualToString:call.method]) {
+    NSString *name = call.arguments[@"name"];
+    NSDictionary *optionsDictionary = call.arguments[@"options"];
+    FIROptions *options =
+        [[FIROptions alloc] initWithGoogleAppID:optionsDictionary[@"googleAppID"]
+                                    GCMSenderID:optionsDictionary[@"GCMSenderID"]];
+    if (![optionsDictionary[@"bundleID"] isEqual:[NSNull null]])
+      options.bundleID = optionsDictionary[@"bundleID"];
+    if (![optionsDictionary[@"APIKey"] isEqual:[NSNull null]])
+      options.APIKey = optionsDictionary[@"APIKey"];
+    if (![optionsDictionary[@"clientID"] isEqual:[NSNull null]])
+      options.clientID = optionsDictionary[@"clientID"];
+    if (![optionsDictionary[@"trackingID"] isEqual:[NSNull null]])
+      options.trackingID = optionsDictionary[@"trackingID"];
+    if (![optionsDictionary[@"projectID"] isEqual:[NSNull null]])
+      options.projectID = optionsDictionary[@"projectID"];
+    if (![optionsDictionary[@"androidClientID"] isEqual:[NSNull null]])
+      options.androidClientID = optionsDictionary[@"androidClientID"];
+    if (![optionsDictionary[@"databaseURL"] isEqual:[NSNull null]])
+      options.databaseURL = optionsDictionary[@"databaseURL"];
+    if (![optionsDictionary[@"storageBucket"] isEqual:[NSNull null]])
+      options.storageBucket = optionsDictionary[@"storageBucket"];
+    if (![optionsDictionary[@"deepLinkURLScheme"] isEqual:[NSNull null]])
+      options.deepLinkURLScheme = optionsDictionary[@"deepLinkURLScheme"];
+    [FIRApp configureWithName:name options:options];
+    result(nil);
+  } else if ([@"FirebaseApp#allApps" isEqualToString:call.method]) {
+    NSDictionary<NSString *, FIRApp *> *allApps = [FIRApp allApps];
+    NSMutableArray *appsList = [NSMutableArray array];
+    for (NSString *name in allApps) {
+      FIRApp *app = allApps[name];
+      [appsList addObject:getDictionaryFromFIRApp(app)];
+    }
+    result(appsList.count > 0 ? appsList : nil);
+  } else if ([@"FirebaseApp#appNamed" isEqualToString:call.method]) {
+    NSString *name = call.arguments;
+    FIRApp *app = [FIRApp appNamed:name];
+    result(getDictionaryFromFIRApp(app));
+  } else {
+    result(FlutterMethodNotImplemented);
+  }
+}
+
+@end

packages/firebase_core/firebase_core/example/macos/.gitignore

@@ -0,0 +1,6 @@
+# Flutter-related
+**/Flutter/ephemeral/
+**/Pods/
+
+# Xcode-related
+**/xcuserdata/

packages/firebase_core/firebase_core/example/macos/Flutter/Flutter-Debug.xcconfig

@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"

packages/firebase_core/firebase_core/example/macos/Flutter/Flutter-Release.xcconfig

@@ -0,0 +1,2 @@
+#include "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
+#include "ephemeral/Flutter-Generated.xcconfig"