Skip to content

Commit fe78cbf

Browse files
E-B-SmithE-B-Smith
authored
Xcode 7 support (#494)
* Added NSLocale category to support Xcode 7.
1 parent 58530fd commit fe78cbf

File tree

6 files changed

+70
-12
lines changed

6 files changed

+70
-12
lines changed

‎Branch-SDK/Branch-SDK/BNCDeviceInfo.m‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,14 @@
66
// Copyright © 2016 Branch Metrics. All rights reserved.
77
//
88

9+
910
#import <Foundation/Foundation.h>
1011
#import <UIKit/UIKit.h>
1112
#import "BNCDeviceInfo.h"
1213
#import "BNCPreferenceHelper.h"
1314
#import "BNCSystemObserver.h"
15+
#import "BNCXcode7Support.h"
16+
1417

1518
@interface BNCDeviceInfo()
1619

@@ -74,8 +77,9 @@ - (id)init {
7477

7578
} else {
7679

77-
self.country = [NSLocale currentLocale].countryCode;
78-
self.language = [NSLocale currentLocale].languageCode;
80+
NSLocale *locale = [NSLocale currentLocale];
81+
self.country = [locale countryCode];
82+
self.language = [locale languageCode ];
7983

8084
}
8185

‎Branch-SDK/Branch-SDK/BNCXcode7Support.h‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
//
2+
// BNCXcode7Support.h
3+
// Branch-TestBed
4+
//
5+
// Created by Edward on 10/26/16.
6+
// Copyright © 2016 Branch Metrics. All rights reserved.
7+
//
8+
9+
10+
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
11+
#warning Compiling with Xcode 7 support
12+
13+
14+
#import <Foundation/Foundation.h>
15+
16+
17+
@interface NSLocale (BranchXcode7Support)
18+
- (NSString*) countryCode;
19+
- (NSString*) languageCode;
20+
@end
21+
22+
23+
#endif

‎Branch-SDK/Branch-SDK/BNCXcode7Support.m‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
//
2+
// BNCXcode7Support.m
3+
// Branch-TestBed
4+
//
5+
// Created by Edward on 10/26/16.
6+
// Copyright © 2016 Branch Metrics. All rights reserved.
7+
//
8+
9+
10+
#import "BNCXcode7Support.h"
11+
12+
13+
#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000
14+
// Usually nothing goes here.
15+
#endif
16+

‎Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@
8989
46DC40801B2B84CD00D2D203 /* BranchShortUrlRequestTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46DC407F1B2B84CD00D2D203 /* BranchShortUrlRequestTests.m */; };
9090
46FD92BA1AE7E8F80012E78F /* BNCSystemObserverTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */; };
9191
46FFCF171ACC321A00039CE0 /* BNCEncodingUtilsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 46FFCF161ACC321A00039CE0 /* BNCEncodingUtilsTests.m */; };
92+
4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */; };
93+
4D8999ED1DC108FF00F7EE0A /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */; };
9294
54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */ = {isa = PBXBuildFile; fileRef = 54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */; };
9395
54391A161BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 54391A141BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m */; };
9496
54FF1F8D1BD1D4AE0004CE2E /* BranchUniversalObject.h in Headers */ = {isa = PBXBuildFile; fileRef = 54FF1F8B1BD1D4AE0004CE2E /* BranchUniversalObject.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -206,6 +208,8 @@
206208
46DC407F1B2B84CD00D2D203 /* BranchShortUrlRequestTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchShortUrlRequestTests.m; sourceTree = "<group>"; };
207209
46FD92B91AE7E8F80012E78F /* BNCSystemObserverTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCSystemObserverTests.m; sourceTree = "<group>"; };
208210
46FFCF161ACC321A00039CE0 /* BNCEncodingUtilsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCEncodingUtilsTests.m; sourceTree = "<group>"; };
211+
4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCXcode7Support.h; sourceTree = "<group>"; };
212+
4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCXcode7Support.m; sourceTree = "<group>"; };
209213
54391A131BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchCSSearchableItemAttributeSet.h; sourceTree = "<group>"; };
210214
54391A141BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchCSSearchableItemAttributeSet.m; sourceTree = "<group>"; };
211215
54FF1F8B1BD1D4AE0004CE2E /* BranchUniversalObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchUniversalObject.h; sourceTree = "<group>"; };
@@ -524,6 +528,8 @@
524528
7D5882391CA1DF2700FF6358 /* BNCDeviceInfo.m */,
525529
E2133B711D0125EF00763049 /* BNCFabricAnswers.h */,
526530
E2133B741D01477200763049 /* BNCFabricAnswers.m */,
531+
4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */,
532+
4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */,
527533
);
528534
name = "Branch-SDK";
529535
path = "../Branch-SDK/Branch-SDK";
@@ -626,6 +632,7 @@
626632
466B587F1B17780A00A69EDE /* BNCEncodingUtils.h in Headers */,
627633
460F4FA71B618A38002E84D6 /* BranchSpotlightUrlRequest.h in Headers */,
628634
54FF1F911BD1DC320004CE2E /* BranchLinkProperties.h in Headers */,
635+
4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */,
629636
67486B8D1B93B48A0044D872 /* BNCStrongMatchHelper.h in Headers */,
630637
46946BA31B2689A100627BCC /* BranchOpenRequest.h in Headers */,
631638
46946BA41B2689A100627BCC /* BranchInstallRequest.h in Headers */,
@@ -833,6 +840,7 @@
833840
463F0A3C1B20A663004235D2 /* BranchShortUrlRequest.m in Sources */,
834841
7D4DAC251C8FA908008E37DB /* BranchViewHandler.m in Sources */,
835842
466B58591B17779C00A69EDE /* BNCPreferenceHelper.m in Sources */,
843+
4D8999ED1DC108FF00F7EE0A /* BNCXcode7Support.m in Sources */,
836844
466B585B1B17779C00A69EDE /* BNCServerInterface.m in Sources */,
837845
463F0A411B20A663004235D2 /* BranchOpenRequest.m in Sources */,
838846
463F0A341B20A663004235D2 /* BranchUserCompletedActionRequest.m in Sources */,

‎Branch-TestBed/Branch-TestBed/AppDelegate.m‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
5858
error:&error];
5959
if (error) {
6060
NSLog(@"Error creating URLForPrefsDirectory: %@.", error);
61-
return nil;
6261
}
6362
URL = [URL URLByAppendingPathComponent:@"io.branch"];
6463

‎carthage-files/BranchSDK.xcodeproj/project.pbxproj‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10+
4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */; };
11+
4D19C1C31DC110FB008D8B38 /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D19C1C11DC110FB008D8B38 /* BNCXcode7Support.m */; };
1012
7DA3BF1D1D889CE500CA8AE0 /* BranchContentDiscoverer.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DA3BF171D889CE500CA8AE0 /* BranchContentDiscoverer.m */; };
1113
7DA3BF1E1D889CE500CA8AE0 /* BranchContentDiscoverer.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DA3BF181D889CE500CA8AE0 /* BranchContentDiscoverer.h */; };
1214
7DA3BF1F1D889CE500CA8AE0 /* BranchContentDiscoveryManifest.h in Headers */ = {isa = PBXBuildFile; fileRef = 7DA3BF191D889CE500CA8AE0 /* BranchContentDiscoveryManifest.h */; };
@@ -90,6 +92,8 @@
9092
/* End PBXBuildFile section */
9193

9294
/* Begin PBXFileReference section */
95+
4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCXcode7Support.h; sourceTree = "<group>"; };
96+
4D19C1C11DC110FB008D8B38 /* BNCXcode7Support.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCXcode7Support.m; sourceTree = "<group>"; };
9397
7DA3BF171D889CE500CA8AE0 /* BranchContentDiscoverer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchContentDiscoverer.m; sourceTree = "<group>"; };
9498
7DA3BF181D889CE500CA8AE0 /* BranchContentDiscoverer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchContentDiscoverer.h; sourceTree = "<group>"; };
9599
7DA3BF191D889CE500CA8AE0 /* BranchContentDiscoveryManifest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchContentDiscoveryManifest.h; sourceTree = "<group>"; };
@@ -196,12 +200,7 @@
196200
E230A1141D03DB9E006181D8 /* Branch-SDK */ = {
197201
isa = PBXGroup;
198202
children = (
199-
7DA3BF171D889CE500CA8AE0 /* BranchContentDiscoverer.m */,
200-
7DA3BF181D889CE500CA8AE0 /* BranchContentDiscoverer.h */,
201-
7DA3BF191D889CE500CA8AE0 /* BranchContentDiscoveryManifest.h */,
202-
7DA3BF1A1D889CE500CA8AE0 /* BranchContentDiscoveryManifest.m */,
203-
7DA3BF1B1D889CE500CA8AE0 /* BranchContentPathProperties.h */,
204-
7DA3BF1C1D889CE500CA8AE0 /* BranchContentPathProperties.m */,
203+
E2B9477A1D15E31700F2270D /* BNCCallbacks.h */,
205204
E230A1151D03DB9E006181D8 /* BNCConfig.h */,
206205
E230A1161D03DB9E006181D8 /* BNCContentDiscoveryManager.h */,
207206
E230A1171D03DB9E006181D8 /* BNCContentDiscoveryManager.m */,
@@ -211,9 +210,10 @@
211210
E230A11B1D03DB9E006181D8 /* BNCEncodingUtils.m */,
212211
E230A11C1D03DB9E006181D8 /* BNCError.h */,
213212
E230A11D1D03DB9E006181D8 /* BNCError.m */,
213+
E2B9477C1D15E3C100F2270D /* BNCFabricAnswers.h */,
214+
E2B9477D1D15E3C100F2270D /* BNCFabricAnswers.m */,
214215
E230A11E1D03DB9E006181D8 /* BNCLinkCache.h */,
215216
E230A11F1D03DB9E006181D8 /* BNCLinkCache.m */,
216-
E2B9477A1D15E31700F2270D /* BNCCallbacks.h */,
217217
E230A1201D03DB9E006181D8 /* BNCLinkData.h */,
218218
E230A1211D03DB9E006181D8 /* BNCLinkData.m */,
219219
E230A1221D03DB9E006181D8 /* BNCPreferenceHelper.h */,
@@ -222,21 +222,27 @@
222222
E230A1251D03DB9E006181D8 /* BNCServerInterface.m */,
223223
E230A1261D03DB9E006181D8 /* BNCServerRequestQueue.h */,
224224
E230A1271D03DB9E006181D8 /* BNCServerRequestQueue.m */,
225-
E2B9477C1D15E3C100F2270D /* BNCFabricAnswers.h */,
226-
E2B9477D1D15E3C100F2270D /* BNCFabricAnswers.m */,
227225
E230A1281D03DB9E006181D8 /* BNCServerResponse.h */,
228226
E230A1291D03DB9E006181D8 /* BNCServerResponse.m */,
229227
E230A12A1D03DB9E006181D8 /* BNCStrongMatchHelper.h */,
230228
E230A12B1D03DB9E006181D8 /* BNCStrongMatchHelper.m */,
231229
E230A12C1D03DB9E006181D8 /* BNCSystemObserver.h */,
232230
E230A12D1D03DB9E006181D8 /* BNCSystemObserver.m */,
231+
4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */,
232+
4D19C1C11DC110FB008D8B38 /* BNCXcode7Support.m */,
233233
E230A12E1D03DB9E006181D8 /* Branch-SDK-Prefix.pch */,
234234
E230A12F1D03DB9E006181D8 /* Branch.h */,
235235
E230A1301D03DB9E006181D8 /* Branch.m */,
236236
E230A1311D03DB9E006181D8 /* BranchActivityItemProvider.h */,
237237
E230A1321D03DB9E006181D8 /* BranchActivityItemProvider.m */,
238238
E230A1331D03DB9E006181D8 /* BranchConstants.h */,
239239
E230A1341D03DB9E006181D8 /* BranchConstants.m */,
240+
7DA3BF181D889CE500CA8AE0 /* BranchContentDiscoverer.h */,
241+
7DA3BF171D889CE500CA8AE0 /* BranchContentDiscoverer.m */,
242+
7DA3BF191D889CE500CA8AE0 /* BranchContentDiscoveryManifest.h */,
243+
7DA3BF1A1D889CE500CA8AE0 /* BranchContentDiscoveryManifest.m */,
244+
7DA3BF1B1D889CE500CA8AE0 /* BranchContentPathProperties.h */,
245+
7DA3BF1C1D889CE500CA8AE0 /* BranchContentPathProperties.m */,
240246
E230A1351D03DB9E006181D8 /* BranchCSSearchableItemAttributeSet.h */,
241247
E230A1361D03DB9E006181D8 /* BranchCSSearchableItemAttributeSet.m */,
242248
E230A1371D03DB9E006181D8 /* BranchDeepLinkingController.h */,
@@ -358,6 +364,7 @@
358364
E230A16D1D03DB9E006181D8 /* BNCContentDiscoveryManager.h in Headers */,
359365
E230A1711D03DB9E006181D8 /* BNCEncodingUtils.h in Headers */,
360366
E230A1981D03DB9E006181D8 /* BNCServerRequest.h in Headers */,
367+
4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */,
361368
E230A1AC1D03DB9E006181D8 /* BranchRedeemRewardsRequest.h in Headers */,
362369
E230A1AE1D03DB9E006181D8 /* BranchRegisterViewRequest.h in Headers */,
363370
E230A18F1D03DB9E006181D8 /* BranchLinkProperties.h in Headers */,
@@ -459,6 +466,7 @@
459466
E230A1721D03DB9E006181D8 /* BNCEncodingUtils.m in Sources */,
460467
E230A1891D03DB9E006181D8 /* BranchActivityItemProvider.m in Sources */,
461468
E230A1AF1D03DB9E006181D8 /* BranchRegisterViewRequest.m in Sources */,
469+
4D19C1C31DC110FB008D8B38 /* BNCXcode7Support.m in Sources */,
462470
E230A19F1D03DB9E006181D8 /* BranchCreditHistoryRequest.m in Sources */,
463471
E230A1B91D03DB9F006181D8 /* BranchUserCompletedActionRequest.m in Sources */,
464472
E230A19D1D03DB9E006181D8 /* BranchCloseRequest.m in Sources */,

0 commit comments

Comments
 (0)