From 712cd7a52d8ada61cee6dfbff0623e88866dac9a Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 1 Oct 2024 14:50:11 -0700
Subject: [PATCH] fixes

---
 FirebaseCore/Extension/FIRAppInternal.h       | 21 +++++++++++++++++++
 FirebaseCore/Sources/FIROptionsInternal.h     | 21 -------------------
 .../UnitTests/FIRMessagingTokenInfoTest.m     |  4 ++++
 3 files changed, 25 insertions(+), 21 deletions(-)

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/Sources/FIROptionsInternal.h b/FirebaseCore/Sources/FIROptionsInternal.h
index fb6899afef7..bdd0267ec92 100644
--- a/FirebaseCore/Sources/FIROptionsInternal.h
+++ b/FirebaseCore/Sources/FIROptionsInternal.h
@@ -16,27 +16,6 @@
 
 #import "FirebaseCore/Sources/Public/FirebaseCore/FIROptions.h"
 
-/**
- * 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;
-
 /**
  * This header file exposes the initialization of FirebaseOptions to internal use.
  */
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;