Update all the header path to pod repo relative

Example/Messaging/Tests/FIRInstanceIDWithFCMTest.m

@@ -14,16 +14,15 @@
  * limitations under the License.
  */
 
+#import <OCMock/OCMock.h>
 #import <XCTest/XCTest.h>
 
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseInstanceID/FirebaseInstanceID.h>
 #import <FirebaseMessaging/FIRMessaging.h>
 
-#import <OCMock/OCMock.h>
-
 #import "Firebase/Messaging/FIRMessaging_Private.h"
-#import "FIRMessagingTestUtilities.h"
+#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
 
 @interface FIRInstanceID (ExposedForTest)
 - (BOOL)isFCMAutoInitEnabled;

Example/Messaging/Tests/FIRMessagingClientTest.m

@@ -23,16 +23,15 @@
 #import <FirebaseInstanceID/FIRInstanceID_Private.h>
 #import <GoogleUtilities/GULReachabilityChecker.h>
 
-#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
-
+#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
 #import "Firebase/Messaging/FIRMessagingClient.h"
 #import "Firebase/Messaging/FIRMessagingConnection.h"
 #import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
 #import "Firebase/Messaging/FIRMessagingRmqManager.h"
 #import "Firebase/Messaging/FIRMessagingSecureSocket.h"
 #import "Firebase/Messaging/FIRMessagingUtilities.h"
 #import "Firebase/Messaging/NSError+FIRMessaging.h"
-#import "FIRMessagingFakeConnection.h"
+#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
 
 static NSString *const kDeviceAuthId = @"123456";
 static NSString *const kSecretToken = @"56789";

Example/Messaging/Tests/FIRMessagingConnectionTest.m

@@ -14,19 +14,17 @@
  * limitations under the License.
  */
 
-#import <XCTest/XCTest.h>
-
 #import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
 
-#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
-
+#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
 #import "Firebase/Messaging/FIRMessagingClient.h"
 #import "Firebase/Messaging/FIRMessagingConnection.h"
 #import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
 #import "Firebase/Messaging/FIRMessagingRmqManager.h"
 #import "Firebase/Messaging/FIRMessagingSecureSocket.h"
 #import "Firebase/Messaging/FIRMessagingUtilities.h"
-#import "FIRMessagingFakeConnection.h"
+#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
 
 static NSString *const kDeviceAuthId = @"123456";
 static NSString *const kSecretToken = @"56789";

Example/Messaging/Tests/FIRMessagingContextManagerServiceTest.m

@@ -14,9 +14,8 @@
  * limitations under the License.
  */
 
-#import <XCTest/XCTest.h>
-
 #import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
 
 #import "Firebase/Messaging/FIRMessagingContextManagerService.h"
 

Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m

@@ -14,12 +14,11 @@
  * limitations under the License.
  */
 
-#import <XCTest/XCTest.h>
-
 #import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
 
 #import <FirebaseMessaging/FIRMessaging.h>
-#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
+
 #import "Firebase/Messaging/FIRMessagingClient.h"
 #import "Firebase/Messaging/FIRMessagingConnection.h"
 #import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
@@ -31,6 +30,7 @@
 #import "Firebase/Messaging/FIRMessagingConstants.h"
 #import "Firebase/Messaging/FIRMessagingDefines.h"
 #import "Firebase/Messaging/NSError+FIRMessaging.h"
+#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
 
 static NSString *const kMessagePersistentID = @"abcdef123";
 static NSString *const kMessageFrom = @"com.example.gcm";

Example/Messaging/Tests/FIRMessagingFakeConnection.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingFakeConnection.h"
+#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
 
 #import <OCMock/OCMock.h>
 

Example/Messaging/Tests/FIRMessagingFakeSocket.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingFakeSocket.h"
+#import "Example/Messaging/Tests/FIRMessagingFakeSocket.h"
 
 #import "Firebase/Messaging/FIRMessagingConstants.h"
 #import "Firebase/Messaging/FIRMessagingDefines.h"

Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-#import <XCTest/XCTest.h>
-
 #import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
 
 #import <FirebaseMessaging/FIRMessaging.h>
+
+#import "Example/Messaging/Tests/FIRMessagingTestNotificationUtilities.h"
+#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
 #import "Firebase/Messaging/FIRMessagingConstants.h"
 
-#import "FIRMessagingTestNotificationUtilities.h"
-#import "FIRMessagingTestUtilities.h"
 
 NSString *const kFIRMessagingTestsLinkHandlingSuiteName = @"com.messaging.test_linkhandling";
 

Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m

@@ -19,8 +19,8 @@
     __MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_14
 #import <UserNotifications/UserNotifications.h>
 #endif
-#import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
 
 #import <FirebaseMessaging/FIRMessaging.h>
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>

Example/Messaging/Tests/FIRMessagingRmqManagerTest.m

@@ -16,11 +16,10 @@
 
 #import <XCTest/XCTest.h>
 
-#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
-
 #import "Firebase/Messaging/FIRMessagingPersistentSyncMessage.h"
 #import "Firebase/Messaging/FIRMessagingRmqManager.h"
 #import "Firebase/Messaging/FIRMessagingUtilities.h"
+#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
 
 static NSString *const kRmqDatabaseName = @"rmq-test-db";
 static NSString *const kRmqDataMessageCategory = @"com.google.gcm-rmq-test";

Example/Messaging/Tests/FIRMessagingSecureSocketTest.m

@@ -14,16 +14,14 @@
  * limitations under the License.
  */
 
-#import <XCTest/XCTest.h>
-
 #import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
 
-#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
+#import "Example/Messaging/Tests/FIRMessagingFakeSocket.h"
 #import "Firebase/Messaging/FIRMessagingConnection.h"
 #import "Firebase/Messaging/FIRMessagingSecureSocket.h"
 #import "Firebase/Messaging/FIRMessagingUtilities.h"
-
-#import "FIRMessagingFakeSocket.h"
+#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
 
 @interface FIRMessagingConnection ()
 

Example/Messaging/Tests/FIRMessagingServiceTest.m

@@ -14,19 +14,18 @@
  * limitations under the License.
  */
 
-#import <XCTest/XCTest.h>
 #import <OCMock/OCMock.h>
+#import <XCTest/XCTest.h>
 
 #import <FirebaseInstanceID/FirebaseInstanceID.h>
 
+#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
 #import <FirebaseMessaging/FIRMessaging.h>
 #import "Firebase/Messaging/FIRMessagingClient.h"
 #import "Firebase/Messaging/FIRMessagingPubSub.h"
 #import "Firebase/Messaging/FIRMessagingTopicsCommon.h"
 #import "Firebase/Messaging/InternalHeaders/FIRMessagingInternalUtilities.h"
 #import "Firebase/Messaging/NSError+FIRMessaging.h"
-#import "FIRMessagingTestUtilities.h"
-
 
 static NSString *const kFakeToken =
     @"fE1e1PZJFSQ:APA91bFAOjp1ahBWn9rTlbjArwBEm_"

Example/Messaging/Tests/FIRMessagingTest.m

@@ -23,8 +23,8 @@
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
 #import <FirebaseMessaging/FIRMessaging.h>
 
+#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
 #import "Firebase/Messaging/FIRMessaging_Private.h"
-#import "FIRMessagingTestUtilities.h"
 
 extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption;
 

Example/Messaging/Tests/FIRMessagingTestNotificationUtilities.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingTestNotificationUtilities.h"
+#import "Example/Messaging/Tests/FIRMessagingTestNotificationUtilities.h"
 
 #import "Firebase/Messaging/FIRMessagingConstants.h"
 

Example/Messaging/Tests/FIRMessagingTestUtilities.m

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingTestUtilities.h"
+#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
 
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
 #import <FirebaseInstanceID/FirebaseInstanceID.h>

Firebase/Messaging/FIRMessaging.m

@@ -18,26 +18,6 @@
 #error FIRMessagingLib should be compiled with ARC.
 #endif
 
-#import "FIRMessaging.h"
-#import "FIRMessaging_Private.h"
-
-#import "FIRMessagingAnalytics.h"
-#import "FIRMessagingClient.h"
-#import "FIRMessagingConstants.h"
-#import "FIRMessagingContextManagerService.h"
-#import "FIRMessagingDataMessageManager.h"
-#import "FIRMessagingDefines.h"
-#import "FIRMessagingExtensionHelper.h"
-#import "FIRMessagingLogger.h"
-#import "FIRMessagingPubSub.h"
-#import "FIRMessagingReceiver.h"
-#import "FIRMessagingRemoteNotificationsProxy.h"
-#import "FIRMessagingRmqManager.h"
-#import "FIRMessagingSyncMessageManager.h"
-#import "FIRMessagingUtilities.h"
-#import "FIRMessagingVersionUtilities.h"
-#import "FIRMessaging_Private.h"
-
 #import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
 #import <FirebaseCore/FIRAppInternal.h>
 #import <FirebaseCore/FIRComponent.h>
@@ -46,11 +26,28 @@
 #import <FirebaseCore/FIRLibrary.h>
 #import <FirebaseInstanceID/FirebaseInstanceID.h>
 #import <FirebaseInstanceID/FIRInstanceID_Private.h>
+#import <FirebaseMessaging/FIRMessaging.h>
+#import <FirebaseMessaging/FIRMessagingExtensionHelper.h>
 #import <GoogleUtilities/GULReachabilityChecker.h>
 #import <GoogleUtilities/GULUserDefaults.h>
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 
-#import "NSError+FIRMessaging.h"
+#import "Firebase/Messaging/FIRMessagingAnalytics.h"
+#import "Firebase/Messaging/FIRMessagingClient.h"
+#import "Firebase/Messaging/FIRMessagingConstants.h"
+#import "Firebase/Messaging/FIRMessagingContextManagerService.h"
+#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
+#import "Firebase/Messaging/FIRMessagingDefines.h"
+#import "Firebase/Messaging/FIRMessagingLogger.h"
+#import "Firebase/Messaging/FIRMessagingPubSub.h"
+#import "Firebase/Messaging/FIRMessagingReceiver.h"
+#import "Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.h"
+#import "Firebase/Messaging/FIRMessagingRmqManager.h"
+#import "Firebase/Messaging/FIRMessagingSyncMessageManager.h"
+#import "Firebase/Messaging/FIRMessagingUtilities.h"
+#import "Firebase/Messaging/FIRMessagingVersionUtilities.h"
+#import "Firebase/Messaging/FIRMessaging_Private.h"
+#import "Firebase/Messaging/NSError+FIRMessaging.h"
 
 static NSString *const kFIRMessagingMessageViaAPNSRootKey = @"aps";
 static NSString *const kFIRMessagingReachabilityHostname = @"www.google.com";

Firebase/Messaging/FIRMessagingAnalytics.m

@@ -14,14 +14,16 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingAnalytics.h"
-#import "FIRMessagingLogger.h"
+#import "Firebase/Messaging/FIRMessagingAnalytics.h"
 
 #import <FirebaseAnalyticsInterop/FIRInteropEventNames.h>
 #import <FirebaseAnalyticsInterop/FIRInteropParameterNames.h>
 #import <GoogleUtilities/GULAppEnvironmentUtil.h>
 #import <GoogleUtilities/GULAppDelegateSwizzler.h>
 
+#import "Firebase/Messaging/FIRMessagingLogger.h"
+
+
 static NSString *const kLogTag = @"FIRMessagingAnalytics";
 
 // aps Key

Firebase/Messaging/FIRMessagingClient.h

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#import "FIRMessaging.h"
+#import <FirebaseMessaging/FIRMessaging.h>
 
 @class GULReachabilityChecker;
 @class GPBMessage;

Firebase/Messaging/FIRMessagingClient.m

@@ -14,22 +14,22 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingClient.h"
+#import "Firebase/Messaging/FIRMessagingClient.h"
 
 #import <FirebaseInstanceID/FIRInstanceID_Private.h>
+#import <FirebaseMessaging/FIRMessaging.h>
 #import <GoogleUtilities/GULReachabilityChecker.h>
 
-#import "FIRMessaging.h"
-#import "FIRMessagingConnection.h"
-#import "FIRMessagingConstants.h"
-#import "FIRMessagingDataMessageManager.h"
-#import "FIRMessagingDefines.h"
-#import "FIRMessagingLogger.h"
-#import "FIRMessagingRmqManager.h"
-#import "FIRMessagingTopicsCommon.h"
-#import "FIRMessagingUtilities.h"
-#import "NSError+FIRMessaging.h"
-#import "FIRMessagingPubSubRegistrar.h"
+#import "Firebase/Messaging/FIRMessagingConnection.h"
+#import "Firebase/Messaging/FIRMessagingConstants.h"
+#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
+#import "Firebase/Messaging/FIRMessagingDefines.h"
+#import "Firebase/Messaging/FIRMessagingLogger.h"
+#import "Firebase/Messaging/FIRMessagingRmqManager.h"
+#import "Firebase/Messaging/FIRMessagingTopicsCommon.h"
+#import "Firebase/Messaging/FIRMessagingUtilities.h"
+#import "Firebase/Messaging/NSError+FIRMessaging.h"
+#import "Firebase/Messaging/FIRMessagingPubSubRegistrar.h"
 
 static const NSTimeInterval kConnectTimeoutInterval = 40.0;
 static const NSTimeInterval kReconnectDelayInSeconds = 2 * 60; // 2 minutes

Firebase/Messaging/FIRMessagingCodedInputStream.m

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingCodedInputStream.h"
-#import "FIRMessagingDefines.h"
+#import "Firebase/Messaging/FIRMessagingCodedInputStream.h"
+#import "Firebase/Messaging/FIRMessagingDefines.h"
 
 typedef struct {
   const void *bytes;

Firebase/Messaging/FIRMessagingConnection.m

@@ -14,20 +14,21 @@
  * limitations under the License.
  */
 
-#import "FIRMessagingConnection.h"
-
-#import "Protos/GtalkCore.pbobjc.h"
-#import "Protos/GtalkExtensions.pbobjc.h"
-
-#import "FIRMessaging.h"
-#import "FIRMessagingDataMessageManager.h"
-#import "FIRMessagingDefines.h"
-#import "FIRMessagingLogger.h"
-#import "FIRMessagingRmqManager.h"
-#import "FIRMessagingSecureSocket.h"
-#import "FIRMessagingUtilities.h"
-#import "FIRMessagingVersionUtilities.h"
-#import "FIRMessaging_Private.h"
+#import "Firebase/Messaging/FIRMessagingConnection.h"
+
+#import <FirebaseMessaging/FIRMessaging.h>
+
+#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
+#import "Firebase/Messaging/Protos/GtalkExtensions.pbobjc.h"
+
+#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
+#import "Firebase/Messaging/FIRMessagingDefines.h"
+#import "Firebase/Messaging/FIRMessagingLogger.h"
+#import "Firebase/Messaging/FIRMessagingRmqManager.h"
+#import "Firebase/Messaging/FIRMessagingSecureSocket.h"
+#import "Firebase/Messaging/FIRMessagingUtilities.h"
+#import "Firebase/Messaging/FIRMessagingVersionUtilities.h"
+#import "Firebase/Messaging/FIRMessaging_Private.h"
 
 static NSInteger const kIqSelectiveAck = 12;
 static NSInteger const kIqStreamAck = 13;