Skip to content

Commit 5f0118d

Browse files
charlotteliangcharlotteliang
authored
Update all the header path to pod repo relative (#3527)
* update all the path to pod repo relative * fix a few missed out headers * reorder the headers
1 parent 92cd109 commit 5f0118d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+196
-202
lines changed

‎Example/Messaging/Tests/FIRInstanceIDWithFCMTest.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17+
#import <OCMock/OCMock.h>
1718
#import <XCTest/XCTest.h>
1819

1920
#import <FirebaseCore/FIRAppInternal.h>
2021
#import <FirebaseInstanceID/FirebaseInstanceID.h>
2122
#import <FirebaseMessaging/FIRMessaging.h>
2223

23-
#import <OCMock/OCMock.h>
24-
2524
#import "Firebase/Messaging/FIRMessaging_Private.h"
26-
#import "FIRMessagingTestUtilities.h"
25+
#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
2726

2827
@interface FIRInstanceID (ExposedForTest)
2928
- (BOOL)isFCMAutoInitEnabled;

‎Example/Messaging/Tests/FIRMessagingClientTest.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,15 @@
2323
#import <FirebaseInstanceID/FIRInstanceID_Private.h>
2424
#import <GoogleUtilities/GULReachabilityChecker.h>
2525

26-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
27-
26+
#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
2827
#import "Firebase/Messaging/FIRMessagingClient.h"
2928
#import "Firebase/Messaging/FIRMessagingConnection.h"
3029
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
3130
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
3231
#import "Firebase/Messaging/FIRMessagingSecureSocket.h"
3332
#import "Firebase/Messaging/FIRMessagingUtilities.h"
3433
#import "Firebase/Messaging/NSError+FIRMessaging.h"
35-
#import "FIRMessagingFakeConnection.h"
34+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
3635

3736
static NSString *const kDeviceAuthId = @"123456";
3837
static NSString *const kSecretToken = @"56789";

‎Example/Messaging/Tests/FIRMessagingConnectionTest.m

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,17 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

21-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
22-
20+
#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
2321
#import "Firebase/Messaging/FIRMessagingClient.h"
2422
#import "Firebase/Messaging/FIRMessagingConnection.h"
2523
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
2624
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
2725
#import "Firebase/Messaging/FIRMessagingSecureSocket.h"
2826
#import "Firebase/Messaging/FIRMessagingUtilities.h"
29-
#import "FIRMessagingFakeConnection.h"
27+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
3028

3129
static NSString *const kDeviceAuthId = @"123456";
3230
static NSString *const kSecretToken = @"56789";

‎Example/Messaging/Tests/FIRMessagingContextManagerServiceTest.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

2120
#import "Firebase/Messaging/FIRMessagingContextManagerService.h"
2221

‎Example/Messaging/Tests/FIRMessagingDataMessageManagerTest.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

2120
#import <FirebaseMessaging/FIRMessaging.h>
22-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
21+
2322
#import "Firebase/Messaging/FIRMessagingClient.h"
2423
#import "Firebase/Messaging/FIRMessagingConnection.h"
2524
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
@@ -31,6 +30,7 @@
3130
#import "Firebase/Messaging/FIRMessagingConstants.h"
3231
#import "Firebase/Messaging/FIRMessagingDefines.h"
3332
#import "Firebase/Messaging/NSError+FIRMessaging.h"
33+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
3434

3535
static NSString *const kMessagePersistentID = @"abcdef123";
3636
static NSString *const kMessageFrom = @"com.example.gcm";

‎Example/Messaging/Tests/FIRMessagingFakeConnection.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingFakeConnection.h"
17+
#import "Example/Messaging/Tests/FIRMessagingFakeConnection.h"
1818

1919
#import <OCMock/OCMock.h>
2020

‎Example/Messaging/Tests/FIRMessagingFakeSocket.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingFakeSocket.h"
17+
#import "Example/Messaging/Tests/FIRMessagingFakeSocket.h"
1818

1919
#import "Firebase/Messaging/FIRMessagingConstants.h"
2020
#import "Firebase/Messaging/FIRMessagingDefines.h"

‎Example/Messaging/Tests/FIRMessagingLinkHandlingTest.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,15 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

2120
#import <FirebaseMessaging/FIRMessaging.h>
21+
22+
#import "Example/Messaging/Tests/FIRMessagingTestNotificationUtilities.h"
23+
#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
2224
#import "Firebase/Messaging/FIRMessagingConstants.h"
2325

24-
#import "FIRMessagingTestNotificationUtilities.h"
25-
#import "FIRMessagingTestUtilities.h"
2626

2727
NSString *const kFIRMessagingTestsLinkHandlingSuiteName = @"com.messaging.test_linkhandling";
2828

‎Example/Messaging/Tests/FIRMessagingRemoteNotificationsProxyTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
__MAC_OS_X_VERSION_MAX_ALLOWED >= __MAC_10_14
2020
#import <UserNotifications/UserNotifications.h>
2121
#endif
22-
#import <XCTest/XCTest.h>
2322
#import <OCMock/OCMock.h>
23+
#import <XCTest/XCTest.h>
2424

2525
#import <FirebaseMessaging/FIRMessaging.h>
2626
#import <GoogleUtilities/GULAppDelegateSwizzler.h>

‎Example/Messaging/Tests/FIRMessagingRmqManagerTest.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,10 @@
1616

1717
#import <XCTest/XCTest.h>
1818

19-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
20-
2119
#import "Firebase/Messaging/FIRMessagingPersistentSyncMessage.h"
2220
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
2321
#import "Firebase/Messaging/FIRMessagingUtilities.h"
22+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
2423

2524
static NSString *const kRmqDatabaseName = @"rmq-test-db";
2625
static NSString *const kRmqDataMessageCategory = @"com.google.gcm-rmq-test";

‎Example/Messaging/Tests/FIRMessagingSecureSocketTest.m

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,14 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
18-
1917
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
2019

21-
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
20+
#import "Example/Messaging/Tests/FIRMessagingFakeSocket.h"
2221
#import "Firebase/Messaging/FIRMessagingConnection.h"
2322
#import "Firebase/Messaging/FIRMessagingSecureSocket.h"
2423
#import "Firebase/Messaging/FIRMessagingUtilities.h"
25-
26-
#import "FIRMessagingFakeSocket.h"
24+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
2725

2826
@interface FIRMessagingConnection ()
2927

‎Example/Messaging/Tests/FIRMessagingServiceTest.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,18 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import <XCTest/XCTest.h>
1817
#import <OCMock/OCMock.h>
18+
#import <XCTest/XCTest.h>
1919

2020
#import <FirebaseInstanceID/FirebaseInstanceID.h>
2121

22+
#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
2223
#import <FirebaseMessaging/FIRMessaging.h>
2324
#import "Firebase/Messaging/FIRMessagingClient.h"
2425
#import "Firebase/Messaging/FIRMessagingPubSub.h"
2526
#import "Firebase/Messaging/FIRMessagingTopicsCommon.h"
2627
#import "Firebase/Messaging/InternalHeaders/FIRMessagingInternalUtilities.h"
2728
#import "Firebase/Messaging/NSError+FIRMessaging.h"
28-
#import "FIRMessagingTestUtilities.h"
29-
3029

3130
static NSString *const kFakeToken =
3231
@"fE1e1PZJFSQ:APA91bFAOjp1ahBWn9rTlbjArwBEm_"

‎Example/Messaging/Tests/FIRMessagingTest.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@
2323
#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
2424
#import <FirebaseMessaging/FIRMessaging.h>
2525

26+
#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
2627
#import "Firebase/Messaging/FIRMessaging_Private.h"
27-
#import "FIRMessagingTestUtilities.h"
2828

2929
extern NSString *const kFIRMessagingFCMTokenFetchAPNSOption;
3030

‎Example/Messaging/Tests/FIRMessagingTestNotificationUtilities.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingTestNotificationUtilities.h"
17+
#import "Example/Messaging/Tests/FIRMessagingTestNotificationUtilities.h"
1818

1919
#import "Firebase/Messaging/FIRMessagingConstants.h"
2020

‎Example/Messaging/Tests/FIRMessagingTestUtilities.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingTestUtilities.h"
17+
#import "Example/Messaging/Tests/FIRMessagingTestUtilities.h"
1818

1919
#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
2020
#import <FirebaseInstanceID/FirebaseInstanceID.h>

‎Firebase/Messaging/FIRMessaging.m

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,6 @@
1818
#error FIRMessagingLib should be compiled with ARC.
1919
#endif
2020

21-
#import "FIRMessaging.h"
22-
#import "FIRMessaging_Private.h"
23-
24-
#import "FIRMessagingAnalytics.h"
25-
#import "FIRMessagingClient.h"
26-
#import "FIRMessagingConstants.h"
27-
#import "FIRMessagingContextManagerService.h"
28-
#import "FIRMessagingDataMessageManager.h"
29-
#import "FIRMessagingDefines.h"
30-
#import "FIRMessagingExtensionHelper.h"
31-
#import "FIRMessagingLogger.h"
32-
#import "FIRMessagingPubSub.h"
33-
#import "FIRMessagingReceiver.h"
34-
#import "FIRMessagingRemoteNotificationsProxy.h"
35-
#import "FIRMessagingRmqManager.h"
36-
#import "FIRMessagingSyncMessageManager.h"
37-
#import "FIRMessagingUtilities.h"
38-
#import "FIRMessagingVersionUtilities.h"
39-
#import "FIRMessaging_Private.h"
40-
4121
#import <FirebaseAnalyticsInterop/FIRAnalyticsInterop.h>
4222
#import <FirebaseCore/FIRAppInternal.h>
4323
#import <FirebaseCore/FIRComponent.h>
@@ -46,11 +26,28 @@
4626
#import <FirebaseCore/FIRLibrary.h>
4727
#import <FirebaseInstanceID/FirebaseInstanceID.h>
4828
#import <FirebaseInstanceID/FIRInstanceID_Private.h>
29+
#import <FirebaseMessaging/FIRMessaging.h>
30+
#import <FirebaseMessaging/FIRMessagingExtensionHelper.h>
4931
#import <GoogleUtilities/GULReachabilityChecker.h>
5032
#import <GoogleUtilities/GULUserDefaults.h>
5133
#import <GoogleUtilities/GULAppDelegateSwizzler.h>
5234

53-
#import "NSError+FIRMessaging.h"
35+
#import "Firebase/Messaging/FIRMessagingAnalytics.h"
36+
#import "Firebase/Messaging/FIRMessagingClient.h"
37+
#import "Firebase/Messaging/FIRMessagingConstants.h"
38+
#import "Firebase/Messaging/FIRMessagingContextManagerService.h"
39+
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
40+
#import "Firebase/Messaging/FIRMessagingDefines.h"
41+
#import "Firebase/Messaging/FIRMessagingLogger.h"
42+
#import "Firebase/Messaging/FIRMessagingPubSub.h"
43+
#import "Firebase/Messaging/FIRMessagingReceiver.h"
44+
#import "Firebase/Messaging/FIRMessagingRemoteNotificationsProxy.h"
45+
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
46+
#import "Firebase/Messaging/FIRMessagingSyncMessageManager.h"
47+
#import "Firebase/Messaging/FIRMessagingUtilities.h"
48+
#import "Firebase/Messaging/FIRMessagingVersionUtilities.h"
49+
#import "Firebase/Messaging/FIRMessaging_Private.h"
50+
#import "Firebase/Messaging/NSError+FIRMessaging.h"
5451

5552
static NSString *const kFIRMessagingMessageViaAPNSRootKey = @"aps";
5653
static NSString *const kFIRMessagingReachabilityHostname = @"www.google.com";

‎Firebase/Messaging/FIRMessagingAnalytics.m

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,16 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingAnalytics.h"
18-
#import "FIRMessagingLogger.h"
17+
#import "Firebase/Messaging/FIRMessagingAnalytics.h"
1918

2019
#import <FirebaseAnalyticsInterop/FIRInteropEventNames.h>
2120
#import <FirebaseAnalyticsInterop/FIRInteropParameterNames.h>
2221
#import <GoogleUtilities/GULAppEnvironmentUtil.h>
2322
#import <GoogleUtilities/GULAppDelegateSwizzler.h>
2423

24+
#import "Firebase/Messaging/FIRMessagingLogger.h"
25+
26+
2527
static NSString *const kLogTag = @"FIRMessagingAnalytics";
2628

2729
// aps Key

‎Firebase/Messaging/FIRMessagingClient.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessaging.h"
17+
#import <FirebaseMessaging/FIRMessaging.h>
1818

1919
@class GULReachabilityChecker;
2020
@class GPBMessage;

‎Firebase/Messaging/FIRMessagingClient.m

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,22 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingClient.h"
17+
#import "Firebase/Messaging/FIRMessagingClient.h"
1818

1919
#import <FirebaseInstanceID/FIRInstanceID_Private.h>
20+
#import <FirebaseMessaging/FIRMessaging.h>
2021
#import <GoogleUtilities/GULReachabilityChecker.h>
2122

22-
#import "FIRMessaging.h"
23-
#import "FIRMessagingConnection.h"
24-
#import "FIRMessagingConstants.h"
25-
#import "FIRMessagingDataMessageManager.h"
26-
#import "FIRMessagingDefines.h"
27-
#import "FIRMessagingLogger.h"
28-
#import "FIRMessagingRmqManager.h"
29-
#import "FIRMessagingTopicsCommon.h"
30-
#import "FIRMessagingUtilities.h"
31-
#import "NSError+FIRMessaging.h"
32-
#import "FIRMessagingPubSubRegistrar.h"
23+
#import "Firebase/Messaging/FIRMessagingConnection.h"
24+
#import "Firebase/Messaging/FIRMessagingConstants.h"
25+
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
26+
#import "Firebase/Messaging/FIRMessagingDefines.h"
27+
#import "Firebase/Messaging/FIRMessagingLogger.h"
28+
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
29+
#import "Firebase/Messaging/FIRMessagingTopicsCommon.h"
30+
#import "Firebase/Messaging/FIRMessagingUtilities.h"
31+
#import "Firebase/Messaging/NSError+FIRMessaging.h"
32+
#import "Firebase/Messaging/FIRMessagingPubSubRegistrar.h"
3333

3434
static const NSTimeInterval kConnectTimeoutInterval = 40.0;
3535
static const NSTimeInterval kReconnectDelayInSeconds = 2 * 60; // 2 minutes

‎Firebase/Messaging/FIRMessagingCodedInputStream.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingCodedInputStream.h"
18-
#import "FIRMessagingDefines.h"
17+
#import "Firebase/Messaging/FIRMessagingCodedInputStream.h"
18+
#import "Firebase/Messaging/FIRMessagingDefines.h"
1919

2020
typedef struct {
2121
const void *bytes;

‎Firebase/Messaging/FIRMessagingConnection.m

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,21 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRMessagingConnection.h"
18-
19-
#import "Protos/GtalkCore.pbobjc.h"
20-
#import "Protos/GtalkExtensions.pbobjc.h"
21-
22-
#import "FIRMessaging.h"
23-
#import "FIRMessagingDataMessageManager.h"
24-
#import "FIRMessagingDefines.h"
25-
#import "FIRMessagingLogger.h"
26-
#import "FIRMessagingRmqManager.h"
27-
#import "FIRMessagingSecureSocket.h"
28-
#import "FIRMessagingUtilities.h"
29-
#import "FIRMessagingVersionUtilities.h"
30-
#import "FIRMessaging_Private.h"
17+
#import "Firebase/Messaging/FIRMessagingConnection.h"
18+
19+
#import <FirebaseMessaging/FIRMessaging.h>
20+
21+
#import "Firebase/Messaging/Protos/GtalkCore.pbobjc.h"
22+
#import "Firebase/Messaging/Protos/GtalkExtensions.pbobjc.h"
23+
24+
#import "Firebase/Messaging/FIRMessagingDataMessageManager.h"
25+
#import "Firebase/Messaging/FIRMessagingDefines.h"
26+
#import "Firebase/Messaging/FIRMessagingLogger.h"
27+
#import "Firebase/Messaging/FIRMessagingRmqManager.h"
28+
#import "Firebase/Messaging/FIRMessagingSecureSocket.h"
29+
#import "Firebase/Messaging/FIRMessagingUtilities.h"
30+
#import "Firebase/Messaging/FIRMessagingVersionUtilities.h"
31+
#import "Firebase/Messaging/FIRMessaging_Private.h"
3132

3233
static NSInteger const kIqSelectiveAck = 12;
3334
static NSInteger const kIqStreamAck = 13;

0 commit comments

Comments
 (0)