[Core] Experiment with startup initialization

FirebaseCore/Sources/FIRAnalyticsConfiguration.h

@@ -33,20 +33,12 @@ static NSString *const kFIRAPersistedConfigMeasurementEnabledStateKey =
 
 static NSString *const kFIRAnalyticsConfigurationSetEnabledNotification =
     @"FIRAnalyticsConfigurationSetEnabledNotification";
-static NSString *const kFIRAnalyticsConfigurationSetMinimumSessionIntervalNotification =
-    @"FIRAnalyticsConfigurationSetMinimumSessionIntervalNotification";
-static NSString *const kFIRAnalyticsConfigurationSetSessionTimeoutIntervalNotification =
-    @"FIRAnalyticsConfigurationSetSessionTimeoutIntervalNotification";
 
 @interface FIRAnalyticsConfiguration : NSObject
 
 /// Returns the shared instance of FIRAnalyticsConfiguration.
 + (FIRAnalyticsConfiguration *)sharedInstance;
 
-// Sets whether analytics collection is enabled for this app on this device. This setting is
-// persisted across app sessions. By default it is enabled.
-- (void)setAnalyticsCollectionEnabled:(BOOL)analyticsCollectionEnabled;
-
 /// Sets whether analytics collection is enabled for this app on this device, and a flag to persist
 /// the value or not. The setting should not be persisted if being set by the global data collection
 /// flag.

FirebaseCore/Sources/FIRAnalyticsConfiguration.m

@@ -39,10 +39,6 @@ - (void)postNotificationName:(NSString *)name value:(id)value {
                                                     userInfo:@{name : value}];
 }
 
-- (void)setAnalyticsCollectionEnabled:(BOOL)analyticsCollectionEnabled {
-  [self setAnalyticsCollectionEnabled:analyticsCollectionEnabled persistSetting:YES];
-}
-
 - (void)setAnalyticsCollectionEnabled:(BOOL)analyticsCollectionEnabled
                        persistSetting:(BOOL)shouldPersist {
   // Persist the measurementEnabledState. Use FIRAnalyticsEnabledState values instead of YES/NO.

FirebaseCore/Sources/FIRApp.m

@@ -333,9 +333,9 @@ - (BOOL)configureCore {
     return NO;
   }
 
-  // Initialize the Analytics once there is a valid options under default app. Analytics should
-  // always initialize first by itself before the other SDKs.
-  if ([self.name isEqualToString:kFIRDefaultAppName]) {
+  static dispatch_once_t analyticsSetupOnceToken;
+  dispatch_once(&analyticsSetupOnceToken, ^{
+    // Analytics is initialized only once and for the first app configured.
     Class firAnalyticsClass = NSClassFromString(@"FIRAnalytics");
     if (firAnalyticsClass) {
 #pragma clang diagnostic push
@@ -352,7 +352,7 @@ - (BOOL)configureCore {
 #pragma clang diagnostic pop
       }
     }
-  }
+  });
 
   [self subscribeForAppDidBecomeActiveNotifications];
 
@@ -448,26 +448,6 @@ + (void)sendNotificationsToSDKs:(FIRApp *)app {
                                                     userInfo:appInfoDict];
 }
 
-+ (NSError *)errorForMissingOptions {
-  NSDictionary *errorDict = @{
-    NSLocalizedDescriptionKey :
-        @"Unable to parse GoogleService-Info.plist in order to configure services.",
-    NSLocalizedRecoverySuggestionErrorKey :
-        @"Check formatting and location of GoogleService-Info.plist."
-  };
-  return [NSError errorWithDomain:kFirebaseCoreErrorDomain code:-100 userInfo:errorDict];
-}
-
-+ (NSError *)errorForInvalidAppID {
-  NSDictionary *errorDict = @{
-    NSLocalizedDescriptionKey : @"Unable to validate Google App ID",
-    NSLocalizedRecoverySuggestionErrorKey :
-        @"Check formatting and location of GoogleService-Info.plist or GoogleAppID set in the "
-        @"customized options."
-  };
-  return [NSError errorWithDomain:kFirebaseCoreErrorDomain code:-101 userInfo:errorDict];
-}
-
 + (BOOL)isDefaultAppConfigured {
   return (sDefaultApp != nil);
 }

FirebaseCore/Sources/FIROptions.m

@@ -151,7 +151,7 @@
   self = [super init];
   if (self) {
     _optionsDictionary = [optionsDictionary mutableCopy];
     _usingOptionsFromDefaultPlist = YES;
   }
   return self;
 }
@@ -163,7 +163,7 @@
     newOptions.deepLinkURLScheme = self.deepLinkURLScheme;
     newOptions.appGroupID = self.appGroupID;
     newOptions.editingLocked = self.isEditingLocked;
     newOptions.usingOptionsFromDefaultPlist = self.usingOptionsFromDefaultPlist;
   }
   return newOptions;
 }
@@ -414,8 +414,8 @@
 
 /**
  * Whether or not Measurement was enabled. Measurement is enabled unless explicitly disabled in
- * GoogleService-Info.plist. This uses the old plist flag IS_MEASUREMENT_ENABLED, which should still
- * be supported.
+ * GoogleService-Info.plist. This uses the old plist flag `IS_MEASUREMENT_ENABLED`, which should
+ * still be supported.
  */
 - (BOOL)isMeasurementEnabled {
   if (self.isAnalyticsCollectionDeactivated) {

FirebaseCore/Sources/FIROptionsInternal.h

@@ -64,18 +64,6 @@
  */
 @property(nonatomic, readonly, copy) NSString *libraryVersionID;
 
-/**
- * The flag indicating whether this object was constructed with the values in the default plist
- * file.
- */
-@property(nonatomic) BOOL usingOptionsFromDefaultPlist;
-
-/**
- * Whether or not Measurement was enabled. Measurement is enabled unless explicitly disabled in
- * GoogleService-Info.plist.
- */
-@property(nonatomic, readonly) BOOL isMeasurementEnabled;
-
 /**
  * Whether or not editing is locked. This should occur after `FirebaseOptions` has been set on a
  * `FirebaseApp`.

FirebaseCore/Tests/Unit/FIRAppTest.m

@@ -43,7 +43,6 @@ @interface FIRApp (TestInternal)
 + (void)resetApps;
 - (instancetype)initInstanceWithName:(NSString *)name options:(FIROptions *)options;
 - (BOOL)configureCore;
-+ (NSError *)errorForInvalidAppID;
 - (BOOL)isAppIDValid;
 + (NSString *)actualBundleID;
 + (NSNumber *)mapFromServiceStringToTypeEnum:(NSString *)serviceString;

FirebaseCore/Tests/Unit/FIROptionsTest.m

@@ -27,6 +27,18 @@
 
 @interface FIROptions (Test)
 
+/**
+ * The flag indicating whether this object was constructed with the values in the default plist
+ * file.
+ */
+@property(nonatomic) BOOL usingOptionsFromDefaultPlist;
+
+/**
+ * Whether or not Measurement was enabled. Measurement is enabled unless explicitly disabled in
+ * GoogleService-Info.plist.
+ */
+@property(nonatomic, readonly) BOOL isMeasurementEnabled;
+
 - (nullable NSDictionary *)analyticsOptionsDictionaryWithInfoDictionary:
     (nullable NSDictionary *)infoDictionary;
 

FirebaseFirestoreInternal.podspec

@@ -45,7 +45,6 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling,
   # that "quick open" by filename in Xcode will continue to work.
   s.source_files = [
     'FirebaseCore/Extension/*.h',
-    'FirebaseCore/Sources/FIROptionsInternal.h',
     'Firestore/Source/Public/FirebaseFirestore/*.h',
     'Firestore/Source/**/*.{m,mm}',
     'Firestore/Protos/nanopb/**/*.cc',

Firestore/Source/API/FSTFirestoreComponent.mm

@@ -17,6 +17,7 @@
 #import "Firestore/Source/API/FSTFirestoreComponent.h"
 
 #import <FirebaseAppCheckInterop/FirebaseAppCheckInterop.h>
+#import <FirebaseCore/FIROptions.h>
 
 #include <memory>
 #include <string>
@@ -28,7 +29,6 @@
 #import "FirebaseCore/Extension/FIRComponentContainer.h"
 #import "FirebaseCore/Extension/FIRComponentType.h"
 #import "FirebaseCore/Extension/FIRLibrary.h"
-#import "FirebaseCore/Sources/FIROptionsInternal.h"
 #import "Firestore/Source/API/FIRFirestore+Internal.h"
 
 #include "Firestore/core/include/firebase/firestore/firestore_version.h"

Firestore/core/src/remote/firebase_metadata_provider_apple.mm

@@ -14,11 +14,12 @@
  * limitations under the License.
  */
 
+#import <FirebaseCore/FIROptions.h>
+
 #include "Firestore/core/src/remote/firebase_metadata_provider_apple.h"
 
 #import "FirebaseCore/Extension/FIRAppInternal.h"
 #import "FirebaseCore/Extension/FIRHeartbeatLogger.h"
-#import "FirebaseCore/Sources/FIROptionsInternal.h"
 
 #include "Firestore/core/src/util/string_apple.h"