diff --git a/.github/workflows/installations.yml b/.github/workflows/installations.yml index 5fe5174fa9a..883fa696ae9 100644 --- a/.github/workflows/installations.yml +++ b/.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: diff --git a/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m b/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m index 0c16a290f15..01673efb4d7 100644 --- a/FirebaseABTesting/Tests/Unit/ABTConditionalUserPropertyControllerTest.m +++ b/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]; } diff --git a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckValidatorTests.m b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckValidatorTests.m index da22c5c2747..97d41d7141e 100644 --- a/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckValidatorTests.m +++ b/FirebaseAppCheck/Tests/Unit/Core/FIRAppCheckValidatorTests.m @@ -17,7 +17,7 @@ #import #import "FirebaseAppCheck/Sources/Core/FIRAppCheckValidator.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" @interface FIRAppCheckValidatorTests : XCTestCase @end @@ -25,11 +25,10 @@ @interface FIRAppCheckValidatorTests : XCTestCase @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]; diff --git a/FirebaseAppDistribution/Sources/FIRFADLogger.m b/FirebaseAppDistribution/Sources/FIRFADLogger.m index 22a37ed603a..5eb8b92acd1 100644 --- a/FirebaseAppDistribution/Sources/FIRFADLogger.m +++ b/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]"; diff --git a/FirebaseAuth.podspec b/FirebaseAuth.podspec index ef84243b5cd..91093bc7d99 100644 --- a/FirebaseAuth.podspec +++ b/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' diff --git a/FirebaseCore/CHANGELOG.md b/FirebaseCore/CHANGELOG.md index 55ad25bbeb7..16a6b9d1290 100644 --- a/FirebaseCore/CHANGELOG.md +++ b/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: diff --git a/FirebaseCore/Extension/FIRAppInternal.h b/FirebaseCore/Extension/FIRAppInternal.h index b0b15117227..a5669608449 100644 --- a/FirebaseCore/Extension/FIRAppInternal.h +++ b/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. diff --git a/FirebaseCore/Extension/FIRLogger.h b/FirebaseCore/Extension/FIRLogger.h index 52ed75d7d6e..95adea51e73 100644 --- a/FirebaseCore/Extension/FIRLogger.h +++ b/FirebaseCore/Extension/FIRLogger.h @@ -16,7 +16,7 @@ #import -#import +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". diff --git a/FirebaseCore/Extension/FirebaseCoreInternal.h b/FirebaseCore/Extension/FirebaseCoreInternal.h index 0cb388be4fc..89a20493e08 100644 --- a/FirebaseCore/Extension/FirebaseCoreInternal.h +++ b/FirebaseCore/Extension/FirebaseCoreInternal.h @@ -21,4 +21,3 @@ #import "FIRHeartbeatLogger.h" #import "FIRLibrary.h" #import "FIRLogger.h" -#import "FIROptionsInternal.h" diff --git a/FirebaseCore/Sources/FIRApp.m b/FirebaseCore/Sources/FIRApp.m index 0fc8691b3e2..702799c8114 100644 --- a/FirebaseCore/Sources/FIRApp.m +++ b/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 diff --git a/FirebaseCore/Sources/FIRComponentContainer.m b/FirebaseCore/Sources/FIRComponentContainer.m index b70881cc2e3..d4e4c7c5ad6 100644 --- a/FirebaseCore/Sources/FIRComponentContainer.m +++ b/FirebaseCore/Sources/FIRComponentContainer.m @@ -20,7 +20,8 @@ #import "FirebaseCore/Extension/FIRComponent.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" NS_ASSUME_NONNULL_BEGIN diff --git a/FirebaseCore/Sources/FIROptions.m b/FirebaseCore/Sources/FIROptions.m index 4676a5737f1..bfaeff1620e 100644 --- a/FirebaseCore/Sources/FIROptions.m +++ b/FirebaseCore/Sources/FIROptions.m @@ -14,8 +14,8 @@ #import "FirebaseCore/Extension/FIRAppInternal.h" #import "FirebaseCore/Extension/FIRLogger.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRBundleUtil.h" +#import "FirebaseCore/Sources/FIROptionsInternal.h" #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h" // Keys for the strings in the plist file. diff --git a/FirebaseCore/Extension/FIROptionsInternal.h b/FirebaseCore/Sources/FIROptionsInternal.h similarity index 81% rename from FirebaseCore/Extension/FIROptionsInternal.h rename to FirebaseCore/Sources/FIROptionsInternal.h index 93a03d6894c..bdd0267ec92 100644 --- a/FirebaseCore/Extension/FIROptionsInternal.h +++ b/FirebaseCore/Sources/FIROptionsInternal.h @@ -14,28 +14,7 @@ * limitations under the License. */ -#import - -/** - * 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; +#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" /** * This header file exposes the initialization of FirebaseOptions to internal use. diff --git a/FirebaseCore/Tests/Unit/FIRAppTest.m b/FirebaseCore/Tests/Unit/FIRAppTest.m index b231e608b92..4bfbded209a 100644 --- a/FirebaseCore/Tests/Unit/FIRAppTest.m +++ b/FirebaseCore/Tests/Unit/FIRAppTest.m @@ -31,8 +31,8 @@ #import "FirebaseCore/Extension/FIRAppInternal.h" #import "FirebaseCore/Extension/FIRComponentType.h" #import "FirebaseCore/Extension/FIRHeartbeatLogger.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRAnalyticsConfiguration.h" +#import "FirebaseCore/Sources/FIROptionsInternal.h" #import "SharedTestUtilities/FIROptionsMock.h" NSString *const kFIRTestAppName1 = @"test_app_name_1"; diff --git a/FirebaseCore/Tests/Unit/FIRLoggerTest.m b/FirebaseCore/Tests/Unit/FIRLoggerTest.m index 1c5bda1f9d3..e99a54a88c9 100644 --- a/FirebaseCore/Tests/Unit/FIRLoggerTest.m +++ b/FirebaseCore/Tests/Unit/FIRLoggerTest.m @@ -21,6 +21,7 @@ // No test should include both includes. #import #import "FirebaseCore/Extension/FIRLogger.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIRLoggerLevel.h" #import diff --git a/FirebaseCore/Tests/Unit/FIROptionsTest.m b/FirebaseCore/Tests/Unit/FIROptionsTest.m index fd5c901598f..3f228c83fad 100644 --- a/FirebaseCore/Tests/Unit/FIROptionsTest.m +++ b/FirebaseCore/Tests/Unit/FIROptionsTest.m @@ -15,8 +15,8 @@ #import "FirebaseCore/Tests/Unit/FIRTestCase.h" #import "FirebaseCore/Extension/FIRAppInternal.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" #import "FirebaseCore/Sources/FIRBundleUtil.h" +#import "FirebaseCore/Sources/FIROptionsInternal.h" #import "FirebaseCore/Sources/Public/FirebaseCore/FIRVersion.h" #import "SharedTestUtilities/FIROptionsMock.h" diff --git a/FirebaseCrashlytics.podspec b/FirebaseCrashlytics.podspec index c25cc9e79cd..49d7b6d9f7a 100644 --- a/FirebaseCrashlytics.podspec +++ b/FirebaseCrashlytics.podspec @@ -59,7 +59,7 @@ Pod::Spec.new do |s| cp -f ./Crashlytics/CrashlyticsInputFiles.xcfilelist ./CrashlyticsInputFiles.xcfilelist PREPARE_COMMAND_END - s.dependency 'FirebaseCore', '~> 11.0' + s.dependency 'FirebaseCore', '~> 11.4' s.dependency 'FirebaseInstallations', '~> 11.0' s.dependency 'FirebaseSessions', '~> 11.0' s.dependency 'FirebaseRemoteConfigInterop', '~> 11.0' diff --git a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m index 7b340e6a9d6..f7b0b0f5e3c 100644 --- a/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m +++ b/FirebaseDynamicLinks/Sources/FIRDynamicLinks.m @@ -166,30 +166,15 @@ - (void)configureDynamicLinks:(FIRApp *)app { userInfo:errorDict]; } if (error) { - NSString *message = nil; - if (options.usingOptionsFromDefaultPlist) { - // Configured using plist file - message = [NSString - stringWithFormat: - @"Firebase Dynamic Links has stopped your project " - @"because there are missing or incorrect values provided in %@.%@ that may " - @"prevent your app from behaving as expected:\n\n" - @"Error: %@\n\n" - @"Please fix these issues to ensure that Firebase is correctly configured in " - @"your project.", - kServiceInfoFileName, kServiceInfoFileType, error.localizedFailureReason]; - } else { - // Configured manually - message = [NSString - stringWithFormat: - @"Firebase Dynamic Links has stopped your project " - @"because there are incorrect values provided in Firebase's configuration " - @"options that may prevent your app from behaving as expected:\n\n" - @"Error: %@\n\n" - @"Please fix these issues to ensure that Firebase is correctly configured in " - @"your project.", - error.localizedFailureReason]; - } + NSString *message = + [NSString stringWithFormat: + @"Firebase Dynamic Links has stopped your project " + @"because there are incorrect values provided in Firebase's configuration " + @"options that may prevent your app from behaving as expected:\n\n" + @"Error: %@\n\n" + @"Please fix these issues to ensure that Firebase is correctly configured in " + @"your project.", + error.localizedFailureReason]; [NSException raise:kFirebaseDurableDeepLinkErrorDomain format:@"%@", message]; } [self checkForCustomDomainEntriesInInfoPlist]; diff --git a/FirebaseFirestore.podspec b/FirebaseFirestore.podspec index 33232b14a75..3cb7f40c64b 100644 --- a/FirebaseFirestore.podspec +++ b/FirebaseFirestore.podspec @@ -35,8 +35,8 @@ Google Cloud Firestore is a NoSQL document database built for automatic scaling, "#{s.module_name}_Privacy" => 'Firestore/Swift/Source/Resources/PrivacyInfo.xcprivacy' } - s.dependency 'FirebaseCore', '~> 11.0' - s.dependency 'FirebaseCoreExtension', '~> 11.0' + s.dependency 'FirebaseCore', '~> 11.4' + s.dependency 'FirebaseCoreExtension', '~> 11.4' s.dependency 'FirebaseFirestoreInternal', '11.4.0' s.dependency 'FirebaseSharedSwift', '~> 11.0' diff --git a/FirebaseFunctions.podspec b/FirebaseFunctions.podspec index 854828b01ae..fefc00769ee 100644 --- a/FirebaseFunctions.podspec +++ b/FirebaseFunctions.podspec @@ -35,8 +35,8 @@ Cloud Functions for Firebase. 'FirebaseFunctions/Sources/**/*.swift', ] - s.dependency 'FirebaseCore', '~> 11.0' - s.dependency 'FirebaseCoreExtension', '~> 11.0' + s.dependency 'FirebaseCore', '~> 11.4' + s.dependency 'FirebaseCoreExtension', '~> 11.4' s.dependency 'FirebaseAppCheckInterop', '~> 11.0' s.dependency 'FirebaseAuthInterop', '~> 11.0' s.dependency 'FirebaseMessagingInterop', '~> 11.0' diff --git a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m index 6b96860da65..cfa8ce9da4f 100644 --- a/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m +++ b/FirebaseInstallations/Source/Tests/Unit/FIRInstallationsIDControllerTests.m @@ -97,12 +97,10 @@ - (void)tearDown { #pragma mark - Initialization - (void)testInitWhenProjectIDSetThenItIsPassedToAPIService { - FIROptions *options = [[FIROptions alloc] initInternalWithOptionsDictionary:@{ - kFIRAPIKey : @"api-key", - kFIRProjectID : @"project-id", - kFIRGoogleAppID : @"app-id", - kFIRGCMSenderID : @"sender-id" - }]; + FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:@"app-id" GCMSenderID:@"sender-id"]; + options.projectID = @"project-id"; + options.APIKey = @"api-key"; + FIRApp *app = [[FIRApp alloc] initInstanceWithName:@"app-name" options:options]; OCMExpect([self.mockAPIService alloc]).andReturn(self.mockAPIService); diff --git a/FirebaseMLModelDownloader.podspec b/FirebaseMLModelDownloader.podspec index 5d74e6455a9..443d4c41347 100644 --- a/FirebaseMLModelDownloader.podspec +++ b/FirebaseMLModelDownloader.podspec @@ -36,8 +36,8 @@ Pod::Spec.new do |s| ] s.framework = 'Foundation' - s.dependency 'FirebaseCore', '~> 11.0' - s.dependency 'FirebaseCoreExtension', '~> 11.0' + s.dependency 'FirebaseCore', '~> 11.4' + s.dependency 'FirebaseCoreExtension', '~> 11.4' s.dependency 'FirebaseInstallations', '~> 11.0' s.dependency 'GoogleDataTransport', '~> 10.0' s.dependency 'GoogleUtilities/UserDefaults', '~> 8.0' diff --git a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m index 76dceb1c23d..13d353b1d02 100644 --- a/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m +++ b/FirebaseMessaging/Tests/UnitTests/FIRMessagingTokenInfoTest.m @@ -32,6 +32,10 @@ static NSString *const kIID = @"eMP633ZkDYA"; static BOOL const kAPNSSandbox = NO; +@interface FIROptions () ++ (NSDictionary *)defaultOptionsDictionary; +@end + @interface FIRMessagingTokenInfoTest : XCTestCase @property(nonatomic, strong) NSData *APNSDeviceToken; diff --git a/FirebaseSessions.podspec b/FirebaseSessions.podspec index 42282c5f361..5103d4cac35 100644 --- a/FirebaseSessions.podspec +++ b/FirebaseSessions.podspec @@ -39,8 +39,8 @@ Pod::Spec.new do |s| base_dir + 'SourcesObjC/**/*.{c,h,m,mm}', ] - s.dependency 'FirebaseCore', '~> 11.0' - s.dependency 'FirebaseCoreExtension', '~> 11.0' + s.dependency 'FirebaseCore', '~> 11.4' + s.dependency 'FirebaseCoreExtension', '~> 11.4' s.dependency 'FirebaseInstallations', '~> 11.0' s.dependency 'GoogleDataTransport', '~> 10.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' diff --git a/FirebaseStorage.podspec b/FirebaseStorage.podspec index 3b9e0ec23c9..57e25e7f5a1 100644 --- a/FirebaseStorage.podspec +++ b/FirebaseStorage.podspec @@ -39,8 +39,8 @@ Firebase Storage provides robust, secure file uploads and downloads from Firebas s.dependency 'FirebaseAppCheckInterop', '~> 11.0' s.dependency 'FirebaseAuthInterop', '~> 11.0' - s.dependency 'FirebaseCore', '~> 11.0' - s.dependency 'FirebaseCoreExtension', '~> 11.0' + s.dependency 'FirebaseCore', '~> 11.4' + s.dependency 'FirebaseCoreExtension', '~> 11.4' s.dependency 'GTMSessionFetcher/Core', '>= 3.4', '< 5.0' s.dependency 'GoogleUtilities/Environment', '~> 8.0' diff --git a/FirebaseVertexAI.podspec b/FirebaseVertexAI.podspec index 8f433720a1c..173916a0f7e 100644 --- a/FirebaseVertexAI.podspec +++ b/FirebaseVertexAI.podspec @@ -46,8 +46,8 @@ the Vertex AI in Firebase SDK. s.dependency 'FirebaseAppCheckInterop', '~> 11.2' s.dependency 'FirebaseAuthInterop', '~> 11.2' - s.dependency 'FirebaseCore', '~> 11.2' - s.dependency 'FirebaseCoreExtension', '~> 11.2' + s.dependency 'FirebaseCore', '~> 11.4' + s.dependency 'FirebaseCoreExtension', '~> 11.4' s.test_spec 'unit' do |unit_tests| unit_tests_dir = 'FirebaseVertexAI/Tests/Unit/' diff --git a/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm b/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm index acc32c66be2..9bd751377f6 100644 --- a/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm +++ b/Firestore/Example/Tests/Integration/API/FIRValidationTests.mm @@ -20,7 +20,7 @@ #include #import "FirebaseCore/Extension/FIRAppInternal.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" #import "Firestore/Example/Tests/Util/FSTHelpers.h" #import "Firestore/Example/Tests/Util/FSTIntegrationTestCase.h" #import "Firestore/Source/API/FIRFirestore+Internal.h" diff --git a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm index f42d10bcb01..4b7c7b9f034 100644 --- a/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm +++ b/Firestore/Example/Tests/Util/FSTIntegrationTestCase.mm @@ -34,7 +34,8 @@ #import "FirebaseCore/Extension/FIRAppInternal.h" #import "FirebaseCore/Extension/FIRLogger.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIRLoggerLevel.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" #import "Firestore/Example/Tests/Util/FIRFirestore+Testing.h" #import "Firestore/Example/Tests/Util/FSTEventAccumulator.h" #import "Firestore/Source/API/FIRAggregateQuery+Internal.h" diff --git a/Firestore/Source/API/FSTFirestoreComponent.mm b/Firestore/Source/API/FSTFirestoreComponent.mm index 64c7c882428..ff6e89eadb0 100644 --- a/Firestore/Source/API/FSTFirestoreComponent.mm +++ b/Firestore/Source/API/FSTFirestoreComponent.mm @@ -28,7 +28,7 @@ #import "FirebaseCore/Extension/FIRComponentContainer.h" #import "FirebaseCore/Extension/FIRComponentType.h" #import "FirebaseCore/Extension/FIRLibrary.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" #import "Firestore/Source/API/FIRFirestore+Internal.h" #include "Firestore/core/include/firebase/firestore/firestore_version.h" diff --git a/Firestore/core/src/remote/firebase_metadata_provider_apple.mm b/Firestore/core/src/remote/firebase_metadata_provider_apple.mm index 998961ca977..ea2a4c982b3 100644 --- a/Firestore/core/src/remote/firebase_metadata_provider_apple.mm +++ b/Firestore/core/src/remote/firebase_metadata_provider_apple.mm @@ -18,7 +18,7 @@ #import "FirebaseCore/Extension/FIRAppInternal.h" #import "FirebaseCore/Extension/FIRHeartbeatLogger.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" #include "Firestore/core/src/util/string_apple.h" diff --git a/Firestore/core/src/util/log_apple.mm b/Firestore/core/src/util/log_apple.mm index 7a35adf736c..6d1e7d7ab6c 100644 --- a/Firestore/core/src/util/log_apple.mm +++ b/Firestore/core/src/util/log_apple.mm @@ -24,6 +24,7 @@ #include #import "FirebaseCore/Extension/FIRLogger.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIRLoggerLevel.h" #include "Firestore/core/src/util/string_apple.h" diff --git a/Firestore/core/test/unit/testutil/app_testing.mm b/Firestore/core/test/unit/testutil/app_testing.mm index a51732375a6..643067bb4d3 100644 --- a/Firestore/core/test/unit/testutil/app_testing.mm +++ b/Firestore/core/test/unit/testutil/app_testing.mm @@ -15,7 +15,7 @@ */ #import "FirebaseCore/Extension/FIRAppInternal.h" -#import "FirebaseCore/Extension/FIROptionsInternal.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" #include "Firestore/core/src/util/string_apple.h" #include "Firestore/core/test/unit/testutil/app_testing.h" diff --git a/SharedTestUtilities/FIROptionsMock.m b/SharedTestUtilities/FIROptionsMock.m index 8002fa867db..d9dc4c246ba 100644 --- a/SharedTestUtilities/FIROptionsMock.m +++ b/SharedTestUtilities/FIROptionsMock.m @@ -14,7 +14,7 @@ #import -#import "FirebaseCore/Extension/FIROptionsInternal.h" +#import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h" #import "SharedTestUtilities/FIROptionsMock.h" NSString *const kAPIKey = @"correct_api_key"; @@ -31,6 +31,24 @@ NSString *const kBundleID = @"com.google.FirebaseSDKTests"; NSString *const kProjectID = @"abc-xyz-123"; +/** + * 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; + +@interface FIROptions () ++ (NSDictionary *)defaultOptionsDictionary; +@end + @interface FIROptionsMock () @end