feat: update library

Author: hansemannn

ios/manifest

@@ -2,7 +2,7 @@
 # this is your module manifest and used by Titanium
 # during compilation, packaging, distribution, etc.
 #
-version: 2.0.0
+version: 2.1.0
 apiversion: 2
 architectures: armv7 arm64 i386 x86_64
 description: titanium-firebase-core

ios/platform/FirebaseCore.framework/FirebaseCore

@@ -16,11 +16,6 @@
 
 #import <Foundation/Foundation.h>
 
-#if TARGET_OS_IOS
-// TODO: Remove UIKit import on next breaking change release
-#import <UIKit/UIKit.h>
-#endif
-
 @class FIROptions;
 
 NS_ASSUME_NONNULL_BEGIN
@@ -90,19 +85,11 @@ NS_SWIFT_NAME(FirebaseApp)
  */
 + (nullable FIRApp *)appNamed:(NSString *)name NS_SWIFT_NAME(app(name:));
 
-#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 /**
  * Returns the set of all extant FIRApp instances, or nil if there are no FIRApp instances. This
  * method is thread safe.
  */
 @property(class, readonly, nullable) NSDictionary<NSString *, FIRApp *> *allApps;
-#else
-/**
- * Returns the set of all extant FIRApp instances, or nil if there are no FIRApp instances. This
- * method is thread safe.
- */
-+ (nullable NSDictionary<NSString *, FIRApp *> *)allApps NS_SWIFT_NAME(allApps());
-#endif  // defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 
 /**
  * Cleans up the current FIRApp, freeing associated data and returning its name to the pool for
@@ -126,6 +113,15 @@ NS_SWIFT_NAME(FirebaseApp)
  */
 @property(nonatomic, copy, readonly) FIROptions *options;
 
+/**
+ * Gets or sets whether automatic data collection is enabled for all products. Defaults to `YES`
+ * unless `FirebaseDataCollectionDefaultEnabled` is set to `NO` in your app's Info.plist. This value
+ * is persisted across runs of the app so that it can be set once when users have consented to
+ * collection.
+ */
+@property(nonatomic, readwrite, getter=isDataCollectionDefaultEnabled)
+    BOOL dataCollectionDefaultEnabled;
+
 @end
 
 NS_ASSUME_NONNULL_END

ios/platform/FirebaseCore.framework/Headers/FIRAnalyticsConfiguration.h

@@ -19,25 +19,6 @@
 #import "FIRAnalyticsConfiguration.h"
 #import "FIRLoggerLevel.h"
 
-/**
- * The log levels used by FIRConfiguration.
- */
-typedef NS_ENUM(NSInteger, FIRLogLevel) {
-  /** Error */
-  kFIRLogLevelError __deprecated = 0,
-  /** Warning */
-  kFIRLogLevelWarning __deprecated,
-  /** Info */
-  kFIRLogLevelInfo __deprecated,
-  /** Debug */
-  kFIRLogLevelDebug __deprecated,
-  /** Assert */
-  kFIRLogLevelAssert __deprecated,
-  /** Max */
-  kFIRLogLevelMax __deprecated = kFIRLogLevelAssert
-} DEPRECATED_MSG_ATTRIBUTE(
-    "Use -FIRDebugEnabled and -FIRDebugDisabled or setLoggerLevel. See FIRApp.h for more details.");
-
 NS_ASSUME_NONNULL_BEGIN
 
 /**
@@ -47,21 +28,12 @@ NS_ASSUME_NONNULL_BEGIN
 NS_SWIFT_NAME(FirebaseConfiguration)
 @interface FIRConfiguration : NSObject
 
-#if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 /** Returns the shared configuration object. */
 @property(class, nonatomic, readonly) FIRConfiguration *sharedInstance NS_SWIFT_NAME(shared);
-#else
-/** Returns the shared configuration object. */
-+ (FIRConfiguration *)sharedInstance NS_SWIFT_NAME(shared());
-#endif  // defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 
 /** The configuration class for Firebase Analytics. */
 @property(nonatomic, readwrite) FIRAnalyticsConfiguration *analyticsConfiguration;
 
-/** Global log level. Defaults to kFIRLogLevelError. */
-@property(nonatomic, readwrite, assign) FIRLogLevel logLevel DEPRECATED_MSG_ATTRIBUTE(
-    "Use -FIRDebugEnabled and -FIRDebugDisabled or setLoggerLevel. See FIRApp.h for more details.");
-
 /**
  * Sets the logging level for internal Firebase logging. Firebase will only log messages
  * that are logged at or below loggerLevel. The messages are logged both to the Xcode

ios/platform/FirebaseCore.framework/Headers/FIRApp.h

@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+// Note that importing GULLoggerLevel.h will lead to a non-modular header
+// import error.
+
 /**
  * The log levels used by internal logging.
  */
@@ -24,7 +27,7 @@ typedef NS_ENUM(NSInteger, FIRLoggerLevel) {
   FIRLoggerLevelWarning = 4,
   /** Notice level, matches ASL_LEVEL_NOTICE. */
   FIRLoggerLevelNotice = 5,
-  /** Info level, matches ASL_LEVEL_NOTICE. */
+  /** Info level, matches ASL_LEVEL_INFO. */
   FIRLoggerLevelInfo = 6,
   /** Debug level, matches ASL_LEVEL_DEBUG. */
   FIRLoggerLevelDebug = 7,

ios/platform/FirebaseCore.framework/Headers/FIRConfiguration.h

@@ -90,25 +90,6 @@ NS_SWIFT_NAME(FirebaseOptions)
  */
 @property(nonatomic, copy, nullable) NSString *storageBucket;
 
-/**
- * Initializes a customized instance of FIROptions with keys. googleAppID, bundleID and GCMSenderID
- * are required. Other keys may required for configuring specific services.
- */
-- (instancetype)initWithGoogleAppID:(NSString *)googleAppID
-                           bundleID:(NSString *)bundleID
-                        GCMSenderID:(NSString *)GCMSenderID
-                             APIKey:(NSString *)APIKey
-                           clientID:(NSString *)clientID
-                         trackingID:(NSString *)trackingID
-                    androidClientID:(NSString *)androidClientID
-                        databaseURL:(NSString *)databaseURL
-                      storageBucket:(NSString *)storageBucket
-                  deepLinkURLScheme:(NSString *)deepLinkURLScheme
-    DEPRECATED_MSG_ATTRIBUTE(
-        "Use `-[[FIROptions alloc] initWithGoogleAppID:GCMSenderID:]` "
-        "(`FirebaseOptions(googleAppID:gcmSenderID:)` in Swift)` and property "
-        "setters instead.");
-
 /**
  * Initializes a customized instance of FIROptions from the file at the given plist file path. This
  * will read the file synchronously from disk.

ios/platform/FirebaseCore.framework/Headers/FIRLoggerLevel.h

@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017 Google
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #import "FIRAnalyticsConfiguration.h"
 #import "FIRApp.h"
 #import "FIRConfiguration.h"

ios/platform/FirebaseCore.framework/Headers/FIROptions.h

@@ -2,6 +2,5 @@ framework module FirebaseCore {
   umbrella header "FirebaseCore.h"
   export *
   module * { export *}
-  link "z"
-  link framework "Security"
-  link framework "SystemConfiguration"}
+  link framework "Foundation"
+}

ios/platform/FirebaseCore.framework/Headers/FirebaseCore.h

@@ -1,11 +1,14 @@
 #import <Foundation/Foundation.h>
 
+NS_ASSUME_NONNULL_BEGIN
+
+@class FIRInstanceIDResult;
 /**
  *  @memberof FIRInstanceID
  *
  *  The scope to be used when fetching/deleting a token for Firebase Messaging.
  */
-FOUNDATION_EXPORT NSString *__nonnull const kFIRInstanceIDScopeFirebaseMessaging
+FOUNDATION_EXPORT NSString *const kFIRInstanceIDScopeFirebaseMessaging
     NS_SWIFT_NAME(InstanceIDScopeFirebaseMessaging);
 
 #if defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
@@ -17,7 +20,7 @@ FOUNDATION_EXPORT NSString *__nonnull const kFIRInstanceIDScopeFirebaseMessaging
  *  Instance ID service will throttle the refresh event across all devices
  *  to control the rate of token updates on application servers.
  */
-FOUNDATION_EXPORT const NSNotificationName __nonnull kFIRInstanceIDTokenRefreshNotification
+FOUNDATION_EXPORT const NSNotificationName kFIRInstanceIDTokenRefreshNotification
     NS_SWIFT_NAME(InstanceIDTokenRefresh);
 #else
 /**
@@ -28,7 +31,7 @@ FOUNDATION_EXPORT const NSNotificationName __nonnull kFIRInstanceIDTokenRefreshN
  *  Instance ID service will throttle the refresh event across all devices
  *  to control the rate of token updates on application servers.
  */
-FOUNDATION_EXPORT NSString *__nonnull const kFIRInstanceIDTokenRefreshNotification
+FOUNDATION_EXPORT NSString *const kFIRInstanceIDTokenRefreshNotification
     NS_SWIFT_NAME(InstanceIDTokenRefreshNotification);
 #endif  // defined(__IPHONE_10_0) && __IPHONE_OS_VERSION_MAX_ALLOWED >= __IPHONE_10_0
 
@@ -56,7 +59,7 @@ typedef void (^FIRInstanceIDTokenHandler)(NSString *__nullable token, NSError *_
  *  @param error The error describing why deleting the token failed.
  *               See the error codes below for a more detailed description.
  */
-typedef void (^FIRInstanceIDDeleteTokenHandler)(NSError *__nullable error)
+typedef void (^FIRInstanceIDDeleteTokenHandler)(NSError *error)
     NS_SWIFT_NAME(InstanceIDDeleteTokenHandler);
 
 /**
@@ -84,6 +87,20 @@ typedef void (^FIRInstanceIDHandler)(NSString *__nullable identity, NSError *__n
 typedef void (^FIRInstanceIDDeleteHandler)(NSError *__nullable error)
     NS_SWIFT_NAME(InstanceIDDeleteHandler);
 
+/**
+ *  @related FIRInstanceID
+ *
+ *  The completion handler invoked when the app identity and token are fetched. If the
+ *  identity wasn't created for some reason we return the appropriate error code.
+ *
+ *  @param result   The result containing an identity for the app instance and a valid token,
+ *                  nil if there was an error while creating the result.
+ *  @param error    The error if fetching the identity or token fails else nil.
+ */
+typedef void (^FIRInstanceIDResultHandler)(FIRInstanceIDResult *__nullable result,
+                                           NSError *__nullable error)
+    NS_SWIFT_NAME(InstanceIDResultHandler);
+
 /**
  * Public errors produced by InstanceID.
  */
@@ -114,19 +131,22 @@ typedef NS_ENUM(NSUInteger, FIRInstanceIDError) {
 } NS_SWIFT_NAME(InstanceIDError);
 
 /**
- *  The APNS token type for the app. If the token type is set to `UNKNOWN`
- *  InstanceID will implicitly try to figure out what the actual token type
- *  is from the provisioning profile.
+ * A class contains the results of InstanceID and token query.
+ */
+NS_SWIFT_NAME(InstanceIDResult)
+@interface FIRInstanceIDResult : NSObject <NSCopying>
+
+/**
+ * An instanceID uniquely identifies the app instance.
+ */
+@property(nonatomic, readonly, copy) NSString *instanceID;
+
+/*
+ * Returns a Firebase Messaging scoped token for the firebase app.
  */
-typedef NS_ENUM(NSInteger, FIRInstanceIDAPNSTokenType) {
-  /// Unknown token type.
-  FIRInstanceIDAPNSTokenTypeUnknown,
-  /// Sandbox token type.
-  FIRInstanceIDAPNSTokenTypeSandbox,
-  /// Production token type.
-  FIRInstanceIDAPNSTokenTypeProd,
-} NS_SWIFT_NAME(InstanceIDAPNSTokenType)
-    __deprecated_enum_msg("Use FIRMessaging's APNSToken property instead.");
+@property(nonatomic, readonly, copy) NSString *token;
+
+@end
 
 /**
  *  Instance ID provides a unique identifier for each app instance and a mechanism
@@ -155,36 +175,30 @@ NS_SWIFT_NAME(InstanceID)
  *
  *  @return A shared instance of FIRInstanceID.
  */
-+ (nonnull instancetype)instanceID NS_SWIFT_NAME(instanceID());
++ (instancetype)instanceID NS_SWIFT_NAME(instanceID());
 
 /**
  *  Unavailable. Use +instanceID instead.
  */
-- (nonnull instancetype)init __attribute__((unavailable("Use +instanceID instead.")));
+- (instancetype)init __attribute__((unavailable("Use +instanceID instead.")));
+
+#pragma mark - Tokens
 
 /**
- *  Set APNS token for the application. This APNS token will be used to register
- *  with Firebase Messaging using `token` or
- *  `tokenWithAuthorizedEntity:scope:options:handler`. If the token type is set to
- *  `FIRInstanceIDAPNSTokenTypeUnknown` InstanceID will read the provisioning profile
- *  to find out the token type.
- *
- *  @param token The APNS token for the application.
- *  @param type  The APNS token type for the above token.
+ * Returns a result of app instance identifier InstanceID and a Firebase Messaging scoped token.
+ * param handler    The callback handler invoked when an app instanceID and a default token
+ *                  are generated and returned. If instanceID and token fetching fail for some
+ *                  reason the callback is invoked with nil `result` and the appropriate error.
  */
-- (void)setAPNSToken:(nonnull NSData *)token
-                type:(FIRInstanceIDAPNSTokenType)type
-    __deprecated_msg("Use FIRMessaging's APNSToken property instead.");
-
-#pragma mark - Tokens
+- (void)instanceIDWithHandler:(FIRInstanceIDResultHandler)handler;
 
 /**
  *  Returns a Firebase Messaging scoped token for the firebase app.
  *
  *  @return Returns the stored token if the device has registered with Firebase Messaging, otherwise
  *          returns nil.
  */
-- (nullable NSString *)token;
+- (nullable NSString *)token __deprecated_msg("Use instanceIDWithHandler: instead.");
 
 /**
  *  Returns a token that authorizes an Entity (example: cloud service) to perform
@@ -225,10 +239,10 @@ NS_SWIFT_NAME(InstanceID)
  *                          is nil and a valid `error` is returned. The valid error
  *                          codes have been documented above.
  */
-- (void)tokenWithAuthorizedEntity:(nonnull NSString *)authorizedEntity
-                            scope:(nonnull NSString *)scope
+- (void)tokenWithAuthorizedEntity:(NSString *)authorizedEntity
+                            scope:(NSString *)scope
                           options:(nullable NSDictionary *)options
-                          handler:(nonnull FIRInstanceIDTokenHandler)handler;
+                          handler:(FIRInstanceIDTokenHandler)handler;
 
 /**
  *  Revokes access to a scope (action) for an entity previously
@@ -249,9 +263,9 @@ NS_SWIFT_NAME(InstanceID)
  *                          In case of error an appropriate error object is returned
  *                          else error is nil.
  */
-- (void)deleteTokenWithAuthorizedEntity:(nonnull NSString *)authorizedEntity
-                                  scope:(nonnull NSString *)scope
-                                handler:(nonnull FIRInstanceIDDeleteTokenHandler)handler;
+- (void)deleteTokenWithAuthorizedEntity:(NSString *)authorizedEntity
+                                  scope:(NSString *)scope
+                                handler:(FIRInstanceIDDeleteTokenHandler)handler;
 
 #pragma mark - Identity
 
@@ -269,7 +283,7 @@ NS_SWIFT_NAME(InstanceID)
  *                 a valid identifier is returned and a valid identifier for the
  *                 application instance.
  */
-- (void)getIDWithHandler:(nonnull FIRInstanceIDHandler)handler NS_SWIFT_NAME(getID(handler:));
+- (void)getIDWithHandler:(FIRInstanceIDHandler)handler NS_SWIFT_NAME(getID(handler:));
 
 /**
  *  Resets Instance ID and revokes all tokens.
@@ -283,7 +297,8 @@ NS_SWIFT_NAME(InstanceID)
  *  (like FCM, RemoteConfig or Analytics) or user explicitly calls Instance ID APIs to get an
  *  Instance ID and token again.
  */
-- (void)deleteIDWithHandler:(nonnull FIRInstanceIDDeleteHandler)handler
-    NS_SWIFT_NAME(deleteID(handler:));
+- (void)deleteIDWithHandler:(FIRInstanceIDDeleteHandler)handler NS_SWIFT_NAME(deleteID(handler:));
 
 @end
+
+NS_ASSUME_NONNULL_END

ios/platform/FirebaseCore.framework/Modules/module.modulemap

@@ -2,6 +2,5 @@ framework module FirebaseInstanceID {
   umbrella header "FirebaseInstanceID.h"
   export *
   module * { export *}
-  link "z"
   link framework "Security"
   link framework "SystemConfiguration"}

ios/platform/FirebaseCoreDiagnostics.framework/FirebaseCoreDiagnostics

@@ -0,0 +1,9 @@
+framework module GoogleAppMeasurement {
+  export *
+  module * { export *}
+  link "sqlite3"
+  link "z"
+  link framework "Security"
+  link framework "StoreKit"
+  link framework "SystemConfiguration"
+  link framework "UIKit"}