Skip to content

Commit 0c63b4a

Browse files
fix: address duplicate symbol issue
There seems to be some conflict with TRACK_RESERVED_KEYWORDS in this and Rudder-AppsFlyer iOS integrations.
1 parent c8f371b commit 0c63b4a

3 files changed

Lines changed: 24 additions & 24 deletions

File tree

Example/Podfile.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
PODS:
2-
- FBAEMKit (17.0.2):
3-
- FBSDKCoreKit_Basics (= 17.0.2)
4-
- FBSDKCoreKit (17.0.2):
5-
- FBAEMKit (= 17.0.2)
6-
- FBSDKCoreKit_Basics (= 17.0.2)
7-
- FBSDKCoreKit_Basics (17.0.2)
2+
- FBAEMKit (17.0.3):
3+
- FBSDKCoreKit_Basics (= 17.0.3)
4+
- FBSDKCoreKit (17.0.3):
5+
- FBAEMKit (= 17.0.3)
6+
- FBSDKCoreKit_Basics (= 17.0.3)
7+
- FBSDKCoreKit_Basics (17.0.3)
88
- FBSnapshotTestCase (2.1.4):
99
- FBSnapshotTestCase/SwiftSupport (= 2.1.4)
1010
- FBSnapshotTestCase/Core (2.1.4)
1111
- FBSnapshotTestCase/SwiftSupport (2.1.4):
1212
- FBSnapshotTestCase/Core
13-
- MetricsReporter (1.2.1):
13+
- MetricsReporter (2.0.0):
1414
- RSCrashReporter (= 1.0.1)
1515
- RudderKit (= 1.4.0)
1616
- RSCrashReporter (1.0.1)
17-
- Rudder (1.27.0):
18-
- MetricsReporter (= 1.2.1)
19-
- Rudder-Facebook (2.1.0):
17+
- Rudder (1.29.0):
18+
- MetricsReporter (= 2.0.0)
19+
- Rudder-Facebook (2.2.0):
2020
- FBSDKCoreKit (~> 17.0.2)
2121
- Rudder (~> 1.12)
2222
- RudderKit (1.4.0)
@@ -41,14 +41,14 @@ EXTERNAL SOURCES:
4141
:path: "../"
4242

4343
SPEC CHECKSUMS:
44-
FBAEMKit: 619f96ea65427e8afca240d5b0f4703738dfdf5c
45-
FBSDKCoreKit: a5f384db2e9ee84e98494fed8f983d2bd79accff
46-
FBSDKCoreKit_Basics: d35c775aaf243a2d731dfae7be3a74b1987285ab
44+
FBAEMKit: 9900b2edd99a2d21629a6277e6166f14c6215799
45+
FBSDKCoreKit: 0791f8f68a8630931a4c12aa23a56cc021551596
46+
FBSDKCoreKit_Basics: 46d6b472c0dd0a5a7e972c025033d1c567f54eb4
4747
FBSnapshotTestCase: 094f9f314decbabe373b87cc339bea235a63e07a
48-
MetricsReporter: 99596ee5003c69949ed2f50acc34aee83c42f843
48+
MetricsReporter: 364b98791e868b10e9d512eb50af28d8c11e5cdb
4949
RSCrashReporter: 6b8376ac729b0289ebe0908553e5f56d8171f313
50-
Rudder: 3cfcd9e6c5359cd6d49f411101ed9b894e3b64bd
51-
Rudder-Facebook: a16ee7b2052a92a19865a31698ab77a6a1706c04
50+
Rudder: 7031e52a04312cbc7a70713cac25528a89e63408
51+
Rudder-Facebook: 6e1413f22ec3ed51228f87d5a7ec0ecb15862460
5252
RudderKit: f272f9872183946452ac94cd7bb2244a71e6ca8f
5353

5454
PODFILE CHECKSUM: 7bc5675f1c4b3d6df991eedd0fb3fdaaac414a26

Rudder-Facebook/Classes/RudderFacebookIntegration.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313

1414
NS_ASSUME_NONNULL_BEGIN
1515

16-
@interface RudderFacebookIntegration : NSObject<RSIntegration>
16+
@interface RudderFacebookIntegration : NSObject<RSIntegration> {
17+
NSArray* events;
18+
NSArray *TRACK_RESERVED_KEYWORDS;
19+
}
1720

1821
@property (nonatomic) BOOL limitedDataUse;
1922
@property (nonatomic) int dpoState;

Rudder-Facebook/Classes/RudderFacebookIntegration.m

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@
88
#import "RudderFacebookIntegration.h"
99
#import <FBSDKCoreKit/FBSDKCoreKit.h>
1010

11-
NSArray* events;
1211

1312
@implementation RudderFacebookIntegration
1413

15-
NSArray *TRACK_RESERVED_KEYWORDS;
16-
1714
- (instancetype)initWithConfig:(NSDictionary *)config withAnalytics:(RSClient *)client {
1815
self = [super init];
1916
if (self) {
@@ -27,8 +24,8 @@ - (instancetype)initWithConfig:(NSDictionary *)config withAnalytics:(RSClient *)
2724
self.dpoCountry = 0;
2825
}
2926

30-
events = @[@"identify", @"track", @"screen"];
31-
TRACK_RESERVED_KEYWORDS = [[NSArray alloc] initWithObjects:KeyProductId, KeyRating, @"name", KeyOrderId, KeyCurrency, @"description", KeyQuery, @"value", KeyPrice, KeyRevenue, nil];
27+
self->events = @[@"identify", @"track", @"screen"];
28+
self->TRACK_RESERVED_KEYWORDS = [[NSArray alloc] initWithObjects:KeyProductId, KeyRating, @"name", KeyOrderId, KeyCurrency, @"description", KeyQuery, @"value", KeyPrice, KeyRevenue, nil];
3229

3330
if (self.limitedDataUse) {
3431
[FBSDKSettings.sharedSettings setDataProcessingOptions:@[@"LDU"] country:self.dpoCountry state:self.dpoState];
@@ -42,7 +39,7 @@ - (instancetype)initWithConfig:(NSDictionary *)config withAnalytics:(RSClient *)
4239
}
4340

4441
- (void) processRuderEvent: (nonnull RSMessage *) message {
45-
int label = (int) [events indexOfObject:message.type];
42+
int label = (int) [self->events indexOfObject:message.type];
4643
switch(label)
4744
{
4845
case 0:
@@ -188,7 +185,7 @@ - (NSString *)getFacebookEvent:(NSString *)event {
188185
- (void) handleCustomPropeties: (NSDictionary *)properties params: (NSMutableDictionary<NSString *, id> *)params isScreenEvent: (BOOL)isScreenEvent {
189186
for (NSString *key in properties) {
190187
NSString *value = [properties objectForKey:key];
191-
if (!isScreenEvent && [TRACK_RESERVED_KEYWORDS containsObject:key]) {
188+
if (!isScreenEvent && [self->TRACK_RESERVED_KEYWORDS containsObject:key]) {
192189
continue;
193190
}
194191
if ([value isKindOfClass:[NSNumber class]]) {

0 commit comments

Comments
 (0)