From ec2fbb78ebf5a9b948adf65391cf05776f895269 Mon Sep 17 00:00:00 2001
From: Libin Lu <llu@evolenthealth.com>
Date: Mon, 11 Dec 2017 14:39:43 -0500
Subject: [PATCH] fix header imports

---
 ios/RNFIRMessaging.h                         |  6 +++---
 ios/RNFIRMessaging.xcodeproj/project.pbxproj | 12 ++++++++----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ios/RNFIRMessaging.h b/ios/RNFIRMessaging.h
index 52637da..9813c4f 100644
--- a/ios/RNFIRMessaging.h
+++ b/ios/RNFIRMessaging.h
@@ -1,9 +1,9 @@
 
 #import <UIKit/UIKit.h>
 
-#import <FirebaseCore/FIRApp.h>
-#import <FirebaseMessaging/FirebaseMessaging.h>
-#import <FirebaseInstanceID/FirebaseInstanceID.h>
+@import FirebaseCore;
+@import FirebaseMessaging;
+@import FirebaseInstanceID;
 #import <React/RCTEventEmitter.h>
 
 @import UserNotifications;
diff --git a/ios/RNFIRMessaging.xcodeproj/project.pbxproj b/ios/RNFIRMessaging.xcodeproj/project.pbxproj
index 6813e0d..f662aef 100644
--- a/ios/RNFIRMessaging.xcodeproj/project.pbxproj
+++ b/ios/RNFIRMessaging.xcodeproj/project.pbxproj
@@ -218,16 +218,18 @@
 				CLANG_STATIC_ANALYZER_MODE = deep;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../../../ios/Pods/**",
 					"$(PROJECT_DIR)/../../../ios/Frameworks/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseCore/**",
 					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseMessaging/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseInstanceID/**",
 				);
 				GCC_PREPROCESSOR_DEFINITIONS = "$(inherited)";
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../react-native/React/**",
-					"$(PROJECT_DIR)/../../../ios/Pods/**",
 					"$(PROJECT_DIR)/../../../ios/Frameworks/**",
 					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/Firebase/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
@@ -244,15 +246,17 @@
 				CLANG_STATIC_ANALYZER_MODE = deep;
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(inherited)",
-					"$(PROJECT_DIR)/../../../ios/Pods/**",
 					"$(PROJECT_DIR)/../../../ios/Frameworks/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseCore/**",
 					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseMessaging/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/FirebaseInstanceID/**",
 				);
 				HEADER_SEARCH_PATHS = (
 					"$(SRCROOT)/../../react-native/React/**",
-					"$(PROJECT_DIR)/../../../ios/Pods/**",
 					"$(PROJECT_DIR)/../../../ios/Frameworks/**",
 					"$(SRCROOT)/../../../node_modules/react-native-firestack/ios/**",
+					"$(PROJECT_DIR)/../../../ios/Pods/Firebase/**",
 				);
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
-- 
2.26.2