From 97cc5ee13177fe1eb527f8f52a5e7e140f822f38 Mon Sep 17 00:00:00 2001
From: Chris Bianca <me@chrisbianca.com>
Date: Fri, 11 Aug 2017 16:07:32 +0100
Subject: [PATCH] [ios] Fix conditional imports

---
 ios/RNFirebase/RNFirebase.h                          |  1 +
 ios/RNFirebase/admob/NativeExpressComponent.h        |  3 +--
 ios/RNFirebase/admob/RNFirebaseAdMob.h               |  7 +++----
 ios/RNFirebase/admob/RNFirebaseAdMob.m               |  3 +--
 ios/RNFirebase/analytics/RNFirebaseAnalytics.h       |  7 +++++++
 ios/RNFirebase/auth/RNFirebaseAuth.h                 |  7 +++----
 ios/RNFirebase/config/RNFirebaseRemoteConfig.h       |  7 +++++++
 ios/RNFirebase/crash/RNFirebaseCrash.h               |  7 +++++++
 ios/RNFirebase/database/RNFirebaseDatabase.h         |  6 +++---
 .../database/RNFirebaseDatabaseReference.h           |  2 ++
 .../database/RNFirebaseDatabaseReference.m           | 12 ++++--------
 ios/RNFirebase/messaging/RNFirebaseMessaging.h       |  6 +++---
 ios/RNFirebase/perf/RNFirebasePerformance.h          |  7 +++++++
 ios/RNFirebase/storage/RNFirebaseStorage.h           |  6 +++---
 14 files changed, 52 insertions(+), 29 deletions(-)

diff --git a/ios/RNFirebase/RNFirebase.h b/ios/RNFirebase/RNFirebase.h
index ea11a6eb..58d7ed42 100644
--- a/ios/RNFirebase/RNFirebase.h
+++ b/ios/RNFirebase/RNFirebase.h
@@ -1,5 +1,6 @@
 #ifndef RNFirebase_h
 #define RNFirebase_h
+#import <Foundation/Foundation.h>
 
 #import <React/RCTEventEmitter.h>
 #import <React/RCTBridgeModule.h>
diff --git a/ios/RNFirebase/admob/NativeExpressComponent.h b/ios/RNFirebase/admob/NativeExpressComponent.h
index 1b1302e7..f88f615b 100644
--- a/ios/RNFirebase/admob/NativeExpressComponent.h
+++ b/ios/RNFirebase/admob/NativeExpressComponent.h
@@ -23,8 +23,7 @@
 @end
 #else
 
-@interface NativeExpressComponent : NSObject {
-}
+@interface NativeExpressComponent : NSObject
 @end
 
 #endif
diff --git a/ios/RNFirebase/admob/RNFirebaseAdMob.h b/ios/RNFirebase/admob/RNFirebaseAdMob.h
index 86817a19..91e73cf9 100644
--- a/ios/RNFirebase/admob/RNFirebaseAdMob.h
+++ b/ios/RNFirebase/admob/RNFirebaseAdMob.h
@@ -1,11 +1,11 @@
 #ifndef RNFirebaseAdMob_h
 #define RNFirebaseAdMob_h
-
-#import <React/RCTBridgeModule.h>
+#import <Foundation/Foundation.h>
 
 #if __has_include(<GoogleMobileAds/GADMobileAds.h>)
 #import "Firebase.h"
 #import "RNFirebaseEvents.h"
+#import <React/RCTBridgeModule.h>
 #import "React/RCTEventEmitter.h"
 #import "GoogleMobileAds/GADInterstitialDelegate.h"
 #import "GoogleMobileAds/GADRewardBasedVideoAdDelegate.h"
@@ -23,8 +23,7 @@
 @end
 
 #else
-@interface RNFirebaseAdMob : NSObject {
-}
+@interface RNFirebaseAdMob : NSObject
 @end
 #endif
 
diff --git a/ios/RNFirebase/admob/RNFirebaseAdMob.m b/ios/RNFirebase/admob/RNFirebaseAdMob.m
index b0e3abf8..9a1e7ff8 100644
--- a/ios/RNFirebase/admob/RNFirebaseAdMob.m
+++ b/ios/RNFirebase/admob/RNFirebaseAdMob.m
@@ -219,8 +219,7 @@ RCT_EXPORT_METHOD(clearInterstitial:
 
 #else
 
-@interface RNFirebaseAdMobRewardedVideo : NSObject <RCTBridgeModule> {
-}
+@implementation RNFirebaseAdMob
 @end
 
 #endif
diff --git a/ios/RNFirebase/analytics/RNFirebaseAnalytics.h b/ios/RNFirebase/analytics/RNFirebaseAnalytics.h
index 1591c819..da0c5bba 100644
--- a/ios/RNFirebase/analytics/RNFirebaseAnalytics.h
+++ b/ios/RNFirebase/analytics/RNFirebaseAnalytics.h
@@ -1,6 +1,8 @@
 #ifndef RNFirebaseAnalytics_h
 #define RNFirebaseAnalytics_h
+#import <Foundation/Foundation.h>
 
+#if __has_include(<FirebaseAnalytics/FIRAnalytics.h>)
 #import <React/RCTBridgeModule.h>
 
 @interface RNFirebaseAnalytics : NSObject <RCTBridgeModule> {
@@ -9,4 +11,9 @@
 
 @end
 
+#else
+@interface RNFirebaseAnalytics : NSObject
+@end
+#endif
+
 #endif
diff --git a/ios/RNFirebase/auth/RNFirebaseAuth.h b/ios/RNFirebase/auth/RNFirebaseAuth.h
index 1c991a7f..c3735d56 100644
--- a/ios/RNFirebase/auth/RNFirebaseAuth.h
+++ b/ios/RNFirebase/auth/RNFirebaseAuth.h
@@ -1,10 +1,10 @@
 #ifndef RNFirebaseAuth_h
 #define RNFirebaseAuth_h
-
-#import <React/RCTBridgeModule.h>
+#import <Foundation/Foundation.h>
 
 #if __has_include(<FirebaseAuth/FIRAuth.h>)
 #import "Firebase.h"
+#import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
 @interface RNFirebaseAuth : RCTEventEmitter <RCTBridgeModule> {
@@ -15,8 +15,7 @@
 @end
 
 #else
-@interface RNFirebaseAuth : NSObject <RCTBridgeModule> {
-}
+@interface RNFirebaseAuth : NSObject
 @end
 #endif
 
diff --git a/ios/RNFirebase/config/RNFirebaseRemoteConfig.h b/ios/RNFirebase/config/RNFirebaseRemoteConfig.h
index 98b65028..2f80806a 100644
--- a/ios/RNFirebase/config/RNFirebaseRemoteConfig.h
+++ b/ios/RNFirebase/config/RNFirebaseRemoteConfig.h
@@ -1,10 +1,17 @@
 #ifndef RNFirebaseRemoteConfig_h
 #define RNFirebaseRemoteConfig_h
+#import <Foundation/Foundation.h>
 
+#if __has_include(<FirebaseRemoteConfig/FirebaseRemoteConfig.h>)
 #import <React/RCTBridgeModule.h>
 
 @interface RNFirebaseRemoteConfig : NSObject <RCTBridgeModule>
 
 @end
 
+#else
+@interface RNFirebaseRemoteConfig : NSObject
+@end
+#endif
+
 #endif
diff --git a/ios/RNFirebase/crash/RNFirebaseCrash.h b/ios/RNFirebase/crash/RNFirebaseCrash.h
index 021c6eb5..4b2058a1 100644
--- a/ios/RNFirebase/crash/RNFirebaseCrash.h
+++ b/ios/RNFirebase/crash/RNFirebaseCrash.h
@@ -1,6 +1,8 @@
 #ifndef RNFirebaseCrash_h
 #define RNFirebaseCrash_h
+#import <Foundation/Foundation.h>
 
+#if __has_include(<FirebaseCrash/FIRCrashLog.h>)
 #import <React/RCTBridgeModule.h>
 
 @interface RNFirebaseCrash : NSObject <RCTBridgeModule> {
@@ -9,4 +11,9 @@
 
 @end
 
+#else
+@interface RNFirebaseCrash : NSObject
+@end
+#endif
+
 #endif
diff --git a/ios/RNFirebase/database/RNFirebaseDatabase.h b/ios/RNFirebase/database/RNFirebaseDatabase.h
index 3a0abfa1..7c0789dd 100644
--- a/ios/RNFirebase/database/RNFirebaseDatabase.h
+++ b/ios/RNFirebase/database/RNFirebaseDatabase.h
@@ -1,9 +1,9 @@
 #ifndef RNFirebaseDatabase_h
 #define RNFirebaseDatabase_h
-
-#import <React/RCTBridgeModule.h>
+#import <Foundation/Foundation.h>
 
 #if __has_include(<FirebaseDatabase/FIRDatabase.h>)
+#import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
 @interface RNFirebaseDatabase : RCTEventEmitter<RCTBridgeModule> {}
@@ -13,7 +13,7 @@
 @end
 
 #else
-@interface RNFirebaseDatabase : NSObject<RCTBridgeModule> {}
+@interface RNFirebaseDatabase : NSObject
 @end
 #endif
 
diff --git a/ios/RNFirebase/database/RNFirebaseDatabaseReference.h b/ios/RNFirebase/database/RNFirebaseDatabaseReference.h
index 9274f5f4..6dd5bcd1 100644
--- a/ios/RNFirebase/database/RNFirebaseDatabaseReference.h
+++ b/ios/RNFirebase/database/RNFirebaseDatabaseReference.h
@@ -1,7 +1,9 @@
 #ifndef RNFirebaseDatabaseReference_h
 #define RNFirebaseDatabaseReference_h
+#import <Foundation/Foundation.h>
 
 #if __has_include(<FirebaseDatabase/FIRDatabase.h>)
+#import "RNFirebaseEvents.h"
 #import <React/RCTEventEmitter.h>
 #import "Firebase.h"
 
diff --git a/ios/RNFirebase/database/RNFirebaseDatabaseReference.m b/ios/RNFirebase/database/RNFirebaseDatabaseReference.m
index afc9ae15..9f8984f2 100644
--- a/ios/RNFirebase/database/RNFirebaseDatabaseReference.m
+++ b/ios/RNFirebase/database/RNFirebaseDatabaseReference.m
@@ -1,10 +1,9 @@
 #import "RNFirebaseDatabaseReference.h"
 
-#if __has_include(<FirebaseDatabase/FIRDatabase.h>)
-#import "RNFirebaseEvents.h"
-
 @implementation RNFirebaseDatabaseReference
 
+#if __has_include(<FirebaseDatabase/FIRDatabase.h>)
+
 - (id)initWithPathAndModifiers:(RCTEventEmitter *)emitter database:(FIRDatabase *)database refId:(NSNumber *)refId path:(NSString *)path modifiers:(NSArray *)modifiers {
     self = [super init];
     if (self) {
@@ -187,9 +186,6 @@
     return eventType;
 }
 
-@end
-
-#else
-@implementation RNFirebaseDatabase
-@end
 #endif
+
+@end
diff --git a/ios/RNFirebase/messaging/RNFirebaseMessaging.h b/ios/RNFirebase/messaging/RNFirebaseMessaging.h
index 66d66ab2..ccdc700d 100644
--- a/ios/RNFirebase/messaging/RNFirebaseMessaging.h
+++ b/ios/RNFirebase/messaging/RNFirebaseMessaging.h
@@ -1,10 +1,10 @@
 #ifndef RNFirebaseMessaging_h
 #define RNFirebaseMessaging_h
-
-#import <React/RCTBridgeModule.h>
+#import <Foundation/Foundation.h>
 
 #if __has_include(<FirebaseMessaging/FirebaseMessaging.h>)
 #import <FirebaseMessaging/FirebaseMessaging.h>
+#import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
 @import UserNotifications;
@@ -28,7 +28,7 @@ typedef void (^RCTNotificationResponseCallback)();
 @end
 
 #else
-@interface RNFirebaseMessaging : NSObject<RCTBridgeModule>
+@interface RNFirebaseMessaging : NSObject
 @end
 #endif
 
diff --git a/ios/RNFirebase/perf/RNFirebasePerformance.h b/ios/RNFirebase/perf/RNFirebasePerformance.h
index bf936ab6..ea65d539 100644
--- a/ios/RNFirebase/perf/RNFirebasePerformance.h
+++ b/ios/RNFirebase/perf/RNFirebasePerformance.h
@@ -1,6 +1,8 @@
 #ifndef RNFirebasePerformance_h
 #define RNFirebasePerformance_h
+#import <Foundation/Foundation.h>
 
+#if __has_include(<FirebasePerformance/FIRPerformance.h>)
 #import <React/RCTBridgeModule.h>
 
 @interface RNFirebasePerformance : NSObject <RCTBridgeModule> {
@@ -11,4 +13,9 @@
 
 @end
 
+#else
+@interface RNFirebasePerformance : NSObject
+@end
+#endif
+
 #endif
diff --git a/ios/RNFirebase/storage/RNFirebaseStorage.h b/ios/RNFirebase/storage/RNFirebaseStorage.h
index e8af8568..202bf98d 100644
--- a/ios/RNFirebase/storage/RNFirebaseStorage.h
+++ b/ios/RNFirebase/storage/RNFirebaseStorage.h
@@ -1,9 +1,9 @@
 #ifndef RNFirebaseStorage_h
 #define RNFirebaseStorage_h
-
-#import <React/RCTBridgeModule.h>
+#import <Foundation/Foundation.h>
 
 #if __has_include(<FirebaseStorage/FIRStorage.h>)
+#import <React/RCTBridgeModule.h>
 #import <React/RCTEventEmitter.h>
 
 @interface RNFirebaseStorage : RCTEventEmitter<RCTBridgeModule> {
@@ -13,7 +13,7 @@
 @end
 
 #else
-@interface RNFirebaseStorage : NSObject<RCTBridgeModule>
+@interface RNFirebaseStorage : NSObject
 @end
 #endif