From 01e196126fe553aee596386ba9b5f37bb5f55d94 Mon Sep 17 00:00:00 2001
From: Nick Cooke <nickcooke@google.com>
Date: Tue, 29 Oct 2024 17:15:55 -0400
Subject: [PATCH 1/3] [Infra] Only compile core extension headers once

---
 FirebaseCore/Extension/FIRAppInternal.h        | 5 +++++
 FirebaseCore/Extension/FIRComponent.h          | 5 +++++
 FirebaseCore/Extension/FIRComponentContainer.h | 6 ++++++
 FirebaseCore/Extension/FIRComponentType.h      | 5 +++++
 FirebaseCore/Extension/FIRHeartbeatLogger.h    | 5 +++++
 FirebaseCore/Extension/FIRLibrary.h            | 5 +++++
 FirebaseCore/Extension/FIRLogger.h             | 5 +++++
 FirebaseCore/Extension/FirebaseCoreInternal.h  | 5 +++++
 8 files changed, 41 insertions(+)

diff --git a/FirebaseCore/Extension/FIRAppInternal.h b/FirebaseCore/Extension/FIRAppInternal.h
index a5669608449..96d42ef48be 100644
--- a/FirebaseCore/Extension/FIRAppInternal.h
+++ b/FirebaseCore/Extension/FIRAppInternal.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef FIREBASECORE_FIRAPPINTERNAL_H
+#define FIREBASECORE_FIRAPPINTERNAL_H
+
 #import <FirebaseCore/FIRApp.h>
 
 @class FIRComponentContainer;
@@ -175,3 +178,5 @@ extern NSString *const FIRAuthStateDidChangeInternalNotificationUIDKey;
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FIREBASECORE_FIRAPPINTERNAL_H
diff --git a/FirebaseCore/Extension/FIRComponent.h b/FirebaseCore/Extension/FIRComponent.h
index c58a8517d9b..98c7a89cadb 100644
--- a/FirebaseCore/Extension/FIRComponent.h
+++ b/FirebaseCore/Extension/FIRComponent.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef FIREBASECORE_FIRCOMPONENT_H
+#define FIREBASECORE_FIRCOMPONENT_H
+
 #import <Foundation/Foundation.h>
 
 @class FIRApp;
@@ -82,3 +85,5 @@ NS_SWIFT_NAME(init(_:instantiationTiming:creationBlock:));
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FIREBASECORE_FIRCOMPONENT_H
diff --git a/FirebaseCore/Extension/FIRComponentContainer.h b/FirebaseCore/Extension/FIRComponentContainer.h
index 6ec61470aa3..68640877b16 100644
--- a/FirebaseCore/Extension/FIRComponentContainer.h
+++ b/FirebaseCore/Extension/FIRComponentContainer.h
@@ -13,6 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
+#ifndef FIREBASECORE_FIRCOMPONENTCONTAINER_H
+#define FIREBASECORE_FIRCOMPONENTCONTAINER_H
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -43,3 +47,5 @@ NS_SWIFT_NAME(FirebaseComponentContainer)
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FIREBASECORE_FIRCOMPONENTCONTAINER_H
diff --git a/FirebaseCore/Extension/FIRComponentType.h b/FirebaseCore/Extension/FIRComponentType.h
index c69085d1983..92a5aab6bf6 100644
--- a/FirebaseCore/Extension/FIRComponentType.h
+++ b/FirebaseCore/Extension/FIRComponentType.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef FIREBASECORE_FIRCOMPONENTTYPE_H
+#define FIREBASECORE_FIRCOMPONENTTYPE_H
+
 #import <Foundation/Foundation.h>
 
 @class FIRComponentContainer;
@@ -33,3 +36,5 @@ NS_SWIFT_NAME(ComponentType)
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FIREBASECORE_FIRCOMPONENTTYPE_H
diff --git a/FirebaseCore/Extension/FIRHeartbeatLogger.h b/FirebaseCore/Extension/FIRHeartbeatLogger.h
index 962974e1bca..807aea22062 100644
--- a/FirebaseCore/Extension/FIRHeartbeatLogger.h
+++ b/FirebaseCore/Extension/FIRHeartbeatLogger.h
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef FIREBASECORE_FIRHEARTBEATLOGGER_H
+#define FIREBASECORE_FIRHEARTBEATLOGGER_H
+
 #import <Foundation/Foundation.h>
 
 NS_ASSUME_NONNULL_BEGIN
@@ -102,3 +105,5 @@ NSString *_Nullable FIRHeaderValueFromHeartbeatsPayload(FIRHeartbeatsPayload *he
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FIREBASECORE_FIRHEARTBEATLOGGER_H
diff --git a/FirebaseCore/Extension/FIRLibrary.h b/FirebaseCore/Extension/FIRLibrary.h
index 17664ac619f..fe256ad824f 100644
--- a/FirebaseCore/Extension/FIRLibrary.h
+++ b/FirebaseCore/Extension/FIRLibrary.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef FIREBASECORE_FIRLIBRARY_H
+#define FIREBASECORE_FIRLIBRARY_H
+
 #ifndef FIRLibrary_h
 #define FIRLibrary_h
 
@@ -37,3 +40,5 @@ NS_SWIFT_NAME(Library)
 NS_ASSUME_NONNULL_END
 
 #endif /* FIRLibrary_h */
+
+#endif  // FIREBASECORE_FIRLIBRARY_H
diff --git a/FirebaseCore/Extension/FIRLogger.h b/FirebaseCore/Extension/FIRLogger.h
index 629b5c4bbef..8117189ef04 100644
--- a/FirebaseCore/Extension/FIRLogger.h
+++ b/FirebaseCore/Extension/FIRLogger.h
@@ -14,6 +14,9 @@
  * limitations under the License.
  */
 
+#ifndef FIREBASECORE_FIRLOGGER_H
+#define FIREBASECORE_FIRLOGGER_H
+
 #import <Foundation/Foundation.h>
 
 typedef NS_ENUM(NSInteger, FIRLoggerLevel);
@@ -191,3 +194,5 @@ NS_SWIFT_NAME(FirebaseLogger)
 @end
 
 NS_ASSUME_NONNULL_END
+
+#endif  // FIREBASECORE_FIRLOGGER_H
diff --git a/FirebaseCore/Extension/FirebaseCoreInternal.h b/FirebaseCore/Extension/FirebaseCoreInternal.h
index 89a20493e08..25610089c08 100644
--- a/FirebaseCore/Extension/FirebaseCoreInternal.h
+++ b/FirebaseCore/Extension/FirebaseCoreInternal.h
@@ -12,6 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#ifndef FIREBASECORE_FIREBASECOREINTERNAL_H
+#define FIREBASECORE_FIREBASECOREINTERNAL_H
+
 @import FirebaseCore;
 
 #import "FIRAppInternal.h"
@@ -21,3 +24,5 @@
 #import "FIRHeartbeatLogger.h"
 #import "FIRLibrary.h"
 #import "FIRLogger.h"
+
+#endif  // FIREBASECORE_FIREBASECOREINTERNAL_H

From ab29943ecdff5c494423b494bc3ae6d5ceb8d61a Mon Sep 17 00:00:00 2001
From: Nick Cooke <nickcooke@google.com>
Date: Tue, 29 Oct 2024 17:32:22 -0400
Subject: [PATCH 2/3] [will revert] global ci

---
 Gemfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Gemfile b/Gemfile
index fdb8d3bc67d..7384b7e6a27 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,4 +1,5 @@
 # To update, change version below, run bundle install, test,
+# touch
 # commit Gemfile and Gemfile.lock.
 source 'https://rubygems.org'
 

From b86c6492ba03ab34e1d21433ab2fadf1a8682207 Mon Sep 17 00:00:00 2001
From: Nick Cooke <nickcooke@google.com>
Date: Tue, 29 Oct 2024 18:45:09 -0400
Subject: [PATCH 3/3] [skip ci] Revert "[will revert] global ci"

This reverts commit ab29943ecdff5c494423b494bc3ae6d5ceb8d61a.
---
 Gemfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Gemfile b/Gemfile
index 7384b7e6a27..fdb8d3bc67d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,5 +1,4 @@
 # To update, change version below, run bundle install, test,
-# touch
 # commit Gemfile and Gemfile.lock.
 source 'https://rubygems.org'