Fix FIROptions module organization (#13765)

Author: paulb777

.github/workflows/installations.yml

@@ -55,7 +55,7 @@ jobs:
       run: |
        export FIS_INTEGRATION_TESTS_REQUIRED=${{ steps.secrets.outputs.val }}
        scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseInstallations.podspec \
-         --platforms=${{ matrix.target }} --test-specs=--platforms=${{ matrix.test-specs }}
+         --platforms=${{ matrix.target }} --test-specs=${{ matrix.test-specs }}
 
   spm-package-resolved:
     env:

FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m

@@ -65,11 +65,9 @@ - (void)setUp {
 
   // Must initialize FIRApp before calling set experiment as Firebase Analytics internal event
   // logging requires it.
-  NSDictionary *optionsDictionary = @{
-    kFIRGoogleAppID : @"1:123456789012:ios:1234567890123456",
-    @"GCM_SENDER_ID" : @"123456789012"
-  };
-  FIROptions *options = [[FIROptions alloc] initInternalWithOptionsDictionary:optionsDictionary];
+  FIROptions *options =
+      [[FIROptions alloc] initWithGoogleAppID:@"1:123456789012:ios:1234567890123456"
+                                  GCMSenderID:@"123456789012"];
   [FIRApp configureWithOptions:options];
 }
 

FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckValidatorTests.m

@@ -17,19 +17,18 @@
 #import <XCTest/XCTest.h>
 
 #import "FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.h"
-#import "FirebaseCore/Extension/FIROptionsInternal.h"
+#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h"
 
 @interface FIRAppCheckValidatorTests : XCTestCase
 @end
 
 @implementation FIRAppCheckValidatorTests
 
 - (void)test_tokenExchangeMissingFieldsInOptions_noMissingFields {
-  FIROptions *options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRGoogleAppID : @"TEST_GoogleAppID",
-    kFIRAPIKey : @"TEST_APIKey",
-    kFIRProjectID : @"TEST_ProjectID"
-  }];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:@"TEST_GoogleAppID"
+                                                    GCMSenderID:@"TEST_GCMSenderID"];
+  options.APIKey = @"TEST_APIKey";
+  options.projectID = @"TEST_ProjectID";
 
   NSArray *missingFields = [FIRAppCheckValidator tokenExchangeMissingFieldsInOptions:options];
 
@@ -38,11 +37,10 @@ - (void)test_tokenExchangeMissingFieldsInOptions_noMissingFields {
 
 - (void)test_tokenExchangeMissingFieldsInOptions_singleMissingField {
   // Google App ID is empty:
-  FIROptions *options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{
-    kFIRGoogleAppID : @"",
-    kFIRAPIKey : @"TEST_APIKey",
-    kFIRProjectID : @"TEST_ProjectID"
-  }];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:@""
+                                                    GCMSenderID:@"TEST_GCMSenderID"];
+  options.APIKey = @"TEST_APIKey";
+  options.projectID = @"TEST_ProjectID";
 
   NSArray *missingFields = [FIRAppCheckValidator tokenExchangeMissingFieldsInOptions:options];
 
@@ -51,8 +49,8 @@ - (void)test_tokenExchangeMissingFieldsInOptions_singleMissingField {
 
 - (void)test_tokenExchangeMissingFieldsInOptions_multipleMissingFields {
   // Google App ID is empty, and API Key and Project ID are not set:
-  FIROptions *options =
-      [[FIROptions alloc] initInternalWithOptionsDictionary:@{kFIRGoogleAppID : @""}];
+  FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:@""
+                                                    GCMSenderID:@"TEST_GCMSenderID"];
 
   NSArray *missingFields = [FIRAppCheckValidator tokenExchangeMissingFieldsInOptions:options];
 

FirebaseAppDistribution/Sources/FIRFADLogger.m

@@ -14,6 +14,7 @@
 
 #import "FirebaseAppDistribution/Sources/FIRFADLogger.h"
 #import "FirebaseCore/Extension/FIRLogger.h"
+#import "FirebaseCore/Sources/Public/FirebaseCore/FIRLoggerLevel.h"
 
 FIRLoggerService kFIRLoggerAppDistribution = @"[FirebaseAppDistribution]";
 

FirebaseAuth.podspec

@@ -58,8 +58,8 @@ supports email and password accounts, as well as several 3rd party authenticatio
   s.ios.framework = 'SafariServices'
   s.dependency 'FirebaseAuthInterop', '~> 11.0'
   s.dependency 'FirebaseAppCheckInterop', '~> 11.0'
-  s.dependency 'FirebaseCore', '~> 11.0'
-  s.dependency 'FirebaseCoreExtension', '~> 11.0'
+  s.dependency 'FirebaseCore', '~> 11.4'
+  s.dependency 'FirebaseCoreExtension', '~> 11.4'
   s.dependency 'GoogleUtilities/AppDelegateSwizzler', '~> 8.0'
   s.dependency 'GoogleUtilities/Environment', '~> 8.0'
   s.dependency 'GTMSessionFetcher/Core', '>= 3.4', '< 5.0'

FirebaseCore/CHANGELOG.md

@@ -1,3 +1,6 @@
+# Firebase 11.4.0
+- [fixed] Fixed issue building documentation with some Firebase products. (#13756)
+
 # Firebase 11.0.0
 - [changed] **Breaking change**: Firebase's minimum supported versions have
   updated for the following platforms:

FirebaseCore/Extension/FIRAppInternal.h

@@ -40,6 +40,27 @@ extern NSString *const kFIRAppNameKey;
 extern NSString *const kFIRGoogleAppIDKey;
 extern NSString *const kFirebaseCoreErrorDomain;
 
+/**
+ * Keys for the strings in the plist file.
+ */
+extern NSString *const kFIRAPIKey;
+extern NSString *const kFIRTrackingID;
+extern NSString *const kFIRGoogleAppID;
+extern NSString *const kFIRClientID;
+extern NSString *const kFIRGCMSenderID;
+extern NSString *const kFIRAndroidClientID;
+extern NSString *const kFIRDatabaseURL;
+extern NSString *const kFIRStorageBucket;
+extern NSString *const kFIRBundleID;
+extern NSString *const kFIRProjectID;
+
+/**
+ * Keys for the plist file name
+ */
+extern NSString *const kServiceInfoFileName;
+
+extern NSString *const kServiceInfoFileType;
+
 /**
  * The format string for the `UserDefaults` key used for storing the data collection enabled flag.
  * This includes formatting to append the `FirebaseApp`'s name.

FirebaseCore/Extension/FIRLogger.h

@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-#import <FirebaseCore/FIRLoggerLevel.h>
+typedef NS_ENUM(NSInteger, FIRLoggerLevel);
 
 NS_ASSUME_NONNULL_BEGIN
 
@@ -132,7 +132,7 @@ NS_SWIFT_NAME(FirebaseLogger)
 ///
 /// - Parameters:
 ///   - level: The log level to use (defined by `FirebaseLoggerLevel` enum values).
-///   - service: The service name of type `FirebaseLoggerService`.
+///   - category: The service name of type `FirebaseLoggerService`.
 ///   - code: The message code. Starting with "I-" which means iOS, followed by a capitalized
 ///   three-character service identifier and a six digit integer message ID that is unique within
 ///   the service. An example of the message code is @"I-COR000001".

FirebaseCore/Extension/FirebaseCoreInternal.h

@@ -21,4 +21,3 @@
 #import "FIRHeartbeatLogger.h"
 #import "FIRLibrary.h"
 #import "FIRLogger.h"
-#import "FIROptionsInternal.h"

FirebaseCore/Sources/FIRApp.m

@@ -38,7 +38,8 @@
 #import "FirebaseCore/Extension/FIRHeartbeatLogger.h"
 #import "FirebaseCore/Extension/FIRLibrary.h"
 #import "FirebaseCore/Extension/FIRLogger.h"
-#import "FirebaseCore/Extension/FIROptionsInternal.h"
+#import "FirebaseCore/Sources/FIROptionsInternal.h"
+#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h"
 #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h"
 
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>