revert unrelated changes

9 files changed, 8 insertions, 31 deletions

diff --git a/Firebase/Messaging/FIRMessaging+FIRApp.m b/Firebase/Messaging/FIRMessaging+FIRApp.m
index 4ad7d4e..58ae3af 100644
--- a/Firebase/Messaging/FIRMessaging+FIRApp.m
+++ b/Firebase/Messaging/FIRMessaging+FIRApp.m
@@ -16,16 +16,8 @@
 
 #import "FIRMessaging+FIRApp.h"
 
-#ifdef COCOAPODS
-#import "FIRAppInternal.h"
-#else
-#import "third_party/firebase/ios/Source/FirebaseCore/Library/Private/FIRAppInternal.h"
-#endif
-#ifdef COCOAPODS
-#import "FIROptionsInternal.h"
-#else
-#import "third_party/firebase/ios/Source/FirebaseCore/Library/Private/FIROptionsInternal.h"
-#endif
+#import <FirebaseCore/FIRAppInternal.h>
+#import <FirebaseCore/FIROptionsInternal.h>
 
 #import "FIRMessagingConstants.h"
 #import "FIRMessagingLogger.h"
diff --git a/Firebase/Messaging/FIRMessaging.m b/Firebase/Messaging/FIRMessaging.m
index 2a14e04..16adf82 100644
--- a/Firebase/Messaging/FIRMessaging.m
+++ b/Firebase/Messaging/FIRMessaging.m
@@ -37,12 +37,7 @@
 #import "FIRMessagingUtilities.h"
 #import "FIRMessagingVersionUtilities.h"
 
-#ifdef COCOAPODS
 #import "FIRReachabilityChecker.h"
-#else
-#import "third_party/firebase/ios/Source/FirebaseCore/Library/Private/FIRReachabilityChecker.h"
-#endif
-
 #import "NSError+FIRMessaging.h"
 
 static NSString *const kFIRMessagingMessageViaAPNSRootKey = @"aps";
diff --git a/Firebase/Messaging/FIRMessagingClient.m b/Firebase/Messaging/FIRMessagingClient.m
index e0fc8c4..dc310dd 100644
--- a/Firebase/Messaging/FIRMessagingClient.m
+++ b/Firebase/Messaging/FIRMessagingClient.m
@@ -16,12 +16,6 @@
 
 #import "FIRMessagingClient.h"
 
-#ifdef COCOAPODS
-#import "FIRReachabilityChecker.h"
-#else
-#import "third_party/firebase/ios/Source/FirebaseCore/Library/Private/FIRReachabilityChecker.h"
-#endif
-
 #import "FIRMessagingConnection.h"
 #import "FIRMessagingConstants.h"
 #import "FIRMessagingDataMessageManager.h"
diff --git a/Firebase/Messaging/FIRMessagingConnection.m b/Firebase/Messaging/FIRMessagingConnection.m
index 4d25ba1..afbd0ba 100644
--- a/Firebase/Messaging/FIRMessagingConnection.m
+++ b/Firebase/Messaging/FIRMessagingConnection.m
@@ -16,8 +16,8 @@
 
 #import "FIRMessagingConnection.h"
 
-#import "third_party/firebase/ios/Source/FirebaseMessaging/Library/Protos/GtalkCore.pbobjc.h"
-#import "third_party/firebase/ios/Source/FirebaseMessaging/Library/Protos/GtalkExtensions.pbobjc.h"
+#import "Protos/GtalkCore.pbobjc.h"
+#import "Protos/GtalkExtensions.pbobjc.h"
 
 #import "FIRMessaging.h"
 #import "FIRMessagingDataMessageManager.h"
diff --git a/Firebase/Messaging/FIRMessagingDataMessageManager.m b/Firebase/Messaging/FIRMessagingDataMessageManager.m
index 0822c2c..58dae87 100644
--- a/Firebase/Messaging/FIRMessagingDataMessageManager.m
+++ b/Firebase/Messaging/FIRMessagingDataMessageManager.m
@@ -16,7 +16,7 @@
 
 #import "FIRMessagingDataMessageManager.h"
 
-#import "third_party/firebase/ios/Source/FirebaseMessaging/Library/Protos/GtalkCore.pbobjc.h"
+#import "Protos/GtalkCore.pbobjc.h"
 
 #import "FIRMessagingClient.h"
 #import "FIRMessagingConnection.h"
diff --git a/Firebase/Messaging/FIRMessagingDelayedMessageQueue.m b/Firebase/Messaging/FIRMessagingDelayedMessageQueue.m
index 55e9b8c..0371c02 100644
--- a/Firebase/Messaging/FIRMessagingDelayedMessageQueue.m
+++ b/Firebase/Messaging/FIRMessagingDelayedMessageQueue.m
@@ -16,7 +16,7 @@
 
 #import "FIRMessagingDelayedMessageQueue.h"
 
-#import "third_party/firebase/ios/Source/FirebaseMessaging/Library/Protos/GtalkCore.pbobjc.h"
+#import "Protos/GtalkCore.pbobjc.h"
 
 #import "FIRMessagingDefines.h"
 #import "FIRMessagingRmqManager.h"
diff --git a/Firebase/Messaging/FIRMessagingLogger.m b/Firebase/Messaging/FIRMessagingLogger.m
index abe8233..ee4e771 100644
--- a/Firebase/Messaging/FIRMessagingLogger.m
+++ b/Firebase/Messaging/FIRMessagingLogger.m
@@ -16,11 +16,7 @@
 
 #import "FIRMessagingLogger.h"
 
-#ifdef COCOAPODS
 #import "FIRLogger.h"
-#else
-#import "third_party/firebase/ios/Source/FirebaseCore/Library/Private/FIRLogger.h"
-#endif
 
 @implementation FIRMessagingLogger
 
diff --git a/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m b/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m
index 7b61517..189f366 100644
--- a/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m
+++ b/Firebase/Messaging/FIRMessagingRmq2PersistentStore.m
@@ -18,7 +18,7 @@
 
 #import "sqlite3.h"
 
-#import "third_party/firebase/ios/Source/FirebaseMessaging/Library/Protos/GtalkCore.pbobjc.h"
+#import "Protos/GtalkCore.pbobjc.h"
 
 #import "FIRMessagingConstants.h"
 #import "FIRMessagingDefines.h"
diff --git a/Firebase/Messaging/FIRMessagingUtilities.m b/Firebase/Messaging/FIRMessagingUtilities.m
index f377561..60f3f28 100644
--- a/Firebase/Messaging/FIRMessagingUtilities.m
+++ b/Firebase/Messaging/FIRMessagingUtilities.m
@@ -16,7 +16,7 @@
 
 #import "FIRMessagingUtilities.h"
 
-#import "third_party/firebase/ios/Source/FirebaseMessaging/Library/Protos/GtalkCore.pbobjc.h"
+#import "Protos/GtalkCore.pbobjc.h"
 
 #import "FIRMessagingLogger.h"