Skip to content

Commit f3d030d

Browse files
authored
Fix pod spec lint and remove extraneous IID refs (#7835)
1 parent bdac2b8 commit f3d030d

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

FirebaseMessaging.podspec

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,6 @@ device, and it is completely free.
3939
'Interop/Analytics/Public/*.h',
4040
'FirebaseCore/Sources/Private/*.h',
4141
'FirebaseInstallations/Source/Library/Private/*.h',
42-
'Firebase/InstanceID/Private/*.h',
43-
'Firebase/InstanceID/Public/*.h',
4442
]
4543
s.public_header_files = base_dir + 'Sources/Public/FirebaseMessaging/*.h'
4644
s.library = 'sqlite3'

FirebaseMessaging/Sources/FIRMessaging.m

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
#import <GoogleUtilities/GULAppEnvironmentUtil.h>
2525
#import <GoogleUtilities/GULReachabilityChecker.h>
2626
#import <GoogleUtilities/GULUserDefaults.h>
27-
#import "Firebase/InstanceID/Private/FIRInstanceID_Private.h"
2827
#import "FirebaseCore/Sources/Private/FirebaseCoreInternal.h"
29-
#import "FirebaseInstallations/Source/Library/Public/FirebaseInstallations/FirebaseInstallations.h"
28+
#import "FirebaseInstallations/Source/Library/Private/FirebaseInstallationsInternal.h"
3029
#import "FirebaseMessaging/Sources/FIRMessagingAnalytics.h"
3130
#import "FirebaseMessaging/Sources/FIRMessagingCode.h"
3231
#import "FirebaseMessaging/Sources/FIRMessagingConstants.h"

FirebaseMessaging/Tests/UnitTests/FIRMessagingPendingTopicsListTest.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,14 @@ - (void)testBatchSizeReductionAfterSuccessfulTopicUpdate {
113113
XCTestExpectation *batchSizeReductionExpectation =
114114
[self expectationWithDescription:@"Batch size was reduced after topic suscription"];
115115

116+
__weak id weakSelf = self;
116117
self.alwaysReadyDelegate.subscriptionHandler =
117118
^(NSString *topic, FIRMessagingTopicAction action,
118119
FIRMessagingTopicOperationCompletion completion) {
119120
// Simulate that the handler is generally called asynchronously
120121
dispatch_async(dispatch_get_main_queue(), ^{
121122
if (action == FIRMessagingTopicActionUnsubscribe) {
123+
__unused id self = weakSelf; // In Xcode 11, XCTAssertEqual references self.
122124
XCTAssertEqual(pendingTopics.numberOfBatches, 1);
123125
[batchSizeReductionExpectation fulfill];
124126
}

0 commit comments

Comments
 (0)