diff --git a/Branch-SDK/Branch-SDK/BNCConfig.m b/Branch-SDK/Branch-SDK/BNCConfig.m index 001e72d69..63b0ce457 100644 --- a/Branch-SDK/Branch-SDK/BNCConfig.m +++ b/Branch-SDK/Branch-SDK/BNCConfig.m @@ -8,12 +8,7 @@ #include "BNCConfig.h" -#if defined(BNCTesting) -NSString * const BNC_API_BASE_URL = @"https://auhong.api.beta.branch.io"; -#else NSString * const BNC_API_BASE_URL = @"https://api.branch.io"; -#endif - NSString * const BNC_API_VERSION = @"v1"; NSString * const BNC_LINK_URL = @"https://bnc.lt"; -NSString * const BNC_SDK_VERSION = @"0.14.11"; +NSString * const BNC_SDK_VERSION = @"0.14.12"; diff --git a/Branch-SDK/Branch-SDK/BNCDeviceInfo.m b/Branch-SDK/Branch-SDK/BNCDeviceInfo.m index 1572b7feb..2f1a6cad1 100644 --- a/Branch-SDK/Branch-SDK/BNCDeviceInfo.m +++ b/Branch-SDK/Branch-SDK/BNCDeviceInfo.m @@ -176,12 +176,7 @@ + (NSString*) userAgentString { dispatch_async(dispatch_get_main_queue(), agentBlock); dispatch_time_t timeoutTime = dispatch_time(DISPATCH_TIME_NOW, timeoutDelta); - #if defined(BNCTesting) - long result = dispatch_block_wait(agentBlock, timeoutTime); - NSLog(@"Wait result: %ld.", result); - #else dispatch_block_wait(agentBlock, timeoutTime); - #endif retries--; } return browserUserAgentString; diff --git a/Branch-SDK/Branch-SDK/BNCXcode7Support.h b/Branch-SDK/Branch-SDK/BNCXcode7Support.h index 4989a8751..0c2aca002 100644 --- a/Branch-SDK/Branch-SDK/BNCXcode7Support.h +++ b/Branch-SDK/Branch-SDK/BNCXcode7Support.h @@ -20,5 +20,6 @@ @end typedef NSString * UIActivityType; +typedef NSString * UIApplicationOpenURLOptionsKey; #endif diff --git a/Branch-SDK/Branch-SDK/Branch.h b/Branch-SDK/Branch-SDK/Branch.h index 2facaacac..d89f5da8a 100644 --- a/Branch-SDK/Branch-SDK/Branch.h +++ b/Branch-SDK/Branch-SDK/Branch.h @@ -21,6 +21,7 @@ #import "BranchDeepLinkingController.h" #import "BNCCommerceEvent.h" #import "BranchShareLink.h" +#import "BNCXcode7Support.h" /** `Branch` is the primary interface of the Branch iOS SDK. Currently, all interactions you will make are funneled through this class. It is not meant to be instantiated or subclassed, usage should be limited to the global instance. @@ -375,7 +376,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url - options:(NSDictionary *)options; + options:(NSDictionary *)options; ///-------------------------------- /// @name Push Notification Support diff --git a/Branch-TestBed-Xcode-7/Branch-TestBed.xcodeproj/project.pbxproj b/Branch-TestBed-Xcode-7/Branch-TestBed.xcodeproj/project.pbxproj index f7735e27f..fe1b1fb7a 100644 --- a/Branch-TestBed-Xcode-7/Branch-TestBed.xcodeproj/project.pbxproj +++ b/Branch-TestBed-Xcode-7/Branch-TestBed.xcodeproj/project.pbxproj @@ -104,7 +104,7 @@ 4D44E7D21E68F46800793D79 /* Branch-SDK-Tests.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4D44E7BE1E68F31B00793D79 /* Branch-SDK-Tests.strings */; }; 4D46F63B1E7B4588002317B6 /* BranchShareLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D46F6391E7B4588002317B6 /* BranchShareLink.h */; }; 4D46F63C1E7B4588002317B6 /* BranchShareLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D46F63A1E7B4588002317B6 /* BranchShareLink.m */; }; - 4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */; }; + 4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D8999ED1DC108FF00F7EE0A /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */; }; 4D8EE7A51E1F0A5D00B1F450 /* BNCCommerceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8EE7A31E1F0A5D00B1F450 /* BNCCommerceEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D8EE7A61E1F0A5D00B1F450 /* BNCCommerceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8EE7A41E1F0A5D00B1F450 /* BNCCommerceEvent.m */; }; @@ -663,6 +663,7 @@ 4D8EE7A51E1F0A5D00B1F450 /* BNCCommerceEvent.h in Headers */, 4D35141B1E3201D80085EBA1 /* NSMutableDictionary+Branch.h in Headers */, 466B58791B17780A00A69EDE /* BNCConfig.h in Headers */, + 4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */, 7D4DAC211C8FA8C0008E37DB /* BranchView.h in Headers */, 7D4DAC271C8FA908008E37DB /* BranchViewHandler.h in Headers */, 54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */, @@ -678,7 +679,6 @@ 460F4FA71B618A38002E84D6 /* BranchSpotlightUrlRequest.h in Headers */, 466B587F1B17780A00A69EDE /* BNCEncodingUtils.h in Headers */, 54FF1F911BD1DC320004CE2E /* BranchLinkProperties.h in Headers */, - 4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */, 67486B8D1B93B48A0044D872 /* BNCStrongMatchHelper.h in Headers */, 46946BA31B2689A100627BCC /* BranchOpenRequest.h in Headers */, 46946BA41B2689A100627BCC /* BranchInstallRequest.h in Headers */, diff --git a/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj b/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj index fbc5ce965..6ca7df699 100644 --- a/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj +++ b/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj @@ -92,7 +92,7 @@ 4D35141B1E3201D80085EBA1 /* NSMutableDictionary+Branch.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D3514191E3201D80085EBA1 /* NSMutableDictionary+Branch.h */; }; 4D35141C1E3201D80085EBA1 /* NSMutableDictionary+Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D35141A1E3201D80085EBA1 /* NSMutableDictionary+Branch.m */; }; 4D3FA94B1DFF31EB00E2B6A9 /* BNCConfig.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D3FA94A1DFF31EB00E2B6A9 /* BNCConfig.m */; }; - 4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */; }; + 4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8999EA1DC108FF00F7EE0A /* BNCXcode7Support.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D8999ED1DC108FF00F7EE0A /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8999EB1DC108FF00F7EE0A /* BNCXcode7Support.m */; }; 4D8EE7A51E1F0A5D00B1F450 /* BNCCommerceEvent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D8EE7A31E1F0A5D00B1F450 /* BNCCommerceEvent.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D8EE7A61E1F0A5D00B1F450 /* BNCCommerceEvent.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D8EE7A41E1F0A5D00B1F450 /* BNCCommerceEvent.m */; }; @@ -661,6 +661,7 @@ 4D8EE7A51E1F0A5D00B1F450 /* BNCCommerceEvent.h in Headers */, 4D35141B1E3201D80085EBA1 /* NSMutableDictionary+Branch.h in Headers */, 466B58791B17780A00A69EDE /* BNCConfig.h in Headers */, + 4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */, 7D4DAC211C8FA8C0008E37DB /* BranchView.h in Headers */, 7D4DAC271C8FA908008E37DB /* BranchViewHandler.h in Headers */, 54391A151BA249FA0061CB0F /* BranchCSSearchableItemAttributeSet.h in Headers */, @@ -675,7 +676,6 @@ 460F4FA71B618A38002E84D6 /* BranchSpotlightUrlRequest.h in Headers */, 466B587F1B17780A00A69EDE /* BNCEncodingUtils.h in Headers */, 54FF1F911BD1DC320004CE2E /* BranchLinkProperties.h in Headers */, - 4D8999EC1DC108FF00F7EE0A /* BNCXcode7Support.h in Headers */, 67486B8D1B93B48A0044D872 /* BNCStrongMatchHelper.h in Headers */, 46946BA31B2689A100627BCC /* BranchOpenRequest.h in Headers */, 46946BA41B2689A100627BCC /* BranchInstallRequest.h in Headers */, diff --git a/Branch.framework.zip b/Branch.framework.zip index 78029c2be..3c46f17f3 100644 Binary files a/Branch.framework.zip and b/Branch.framework.zip differ diff --git a/Branch.framework/Versions/A/Branch b/Branch.framework/Versions/A/Branch index dc69c5f72..b086511ac 100644 Binary files a/Branch.framework/Versions/A/Branch and b/Branch.framework/Versions/A/Branch differ diff --git a/Branch.framework/Versions/A/Headers/BNCXcode7Support.h b/Branch.framework/Versions/A/Headers/BNCXcode7Support.h new file mode 100644 index 000000000..0c2aca002 --- /dev/null +++ b/Branch.framework/Versions/A/Headers/BNCXcode7Support.h @@ -0,0 +1,25 @@ +// +// BNCXcode7Support.h +// Branch-TestBed +// +// Created by Edward on 10/26/16. +// Copyright © 2016 Branch Metrics. All rights reserved. +// + + +#if defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED < 100000 +#warning Warning: Compiling with Xcode 7 support + + +#import + + +@interface NSLocale (BranchXcode7Support) +- (NSString*) countryCode; +- (NSString*) languageCode; +@end + +typedef NSString * UIActivityType; +typedef NSString * UIApplicationOpenURLOptionsKey; + +#endif diff --git a/Branch.framework/Versions/A/Headers/Branch.h b/Branch.framework/Versions/A/Headers/Branch.h index 2facaacac..d89f5da8a 100644 --- a/Branch.framework/Versions/A/Headers/Branch.h +++ b/Branch.framework/Versions/A/Headers/Branch.h @@ -21,6 +21,7 @@ #import "BranchDeepLinkingController.h" #import "BNCCommerceEvent.h" #import "BranchShareLink.h" +#import "BNCXcode7Support.h" /** `Branch` is the primary interface of the Branch iOS SDK. Currently, all interactions you will make are funneled through this class. It is not meant to be instantiated or subclassed, usage should be limited to the global instance. @@ -375,7 +376,7 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) { */ - (BOOL)application:(UIApplication *)application openURL:(NSURL *)url - options:(NSDictionary *)options; + options:(NSDictionary *)options; ///-------------------------------- /// @name Push Notification Support diff --git a/Branch.podspec b/Branch.podspec index 925974e28..a06f616a5 100644 --- a/Branch.podspec +++ b/Branch.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Branch" - s.version = "0.14.11" + s.version = "0.14.12" s.summary = "Create an HTTP URL for any piece of content in your app" s.description = <<-DESC - Want the highest possible conversions on your sharing feature? diff --git a/ChangeLog.md b/ChangeLog.md index a0eb78ff6..0e7077cdb 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,8 @@ Branch iOS SDK Change Log +- v0.14.12 + * Fixed headers for Swift compatibility AIS-242 (#615). + - v0.14.11 * *Master Release* * Added `BranchShareLink.h` to public headers. diff --git a/carthage-files/BranchSDK.xcodeproj/project.pbxproj b/carthage-files/BranchSDK.xcodeproj/project.pbxproj index ac52d1fa4..9f786c957 100644 --- a/carthage-files/BranchSDK.xcodeproj/project.pbxproj +++ b/carthage-files/BranchSDK.xcodeproj/project.pbxproj @@ -7,7 +7,7 @@ objects = { /* Begin PBXBuildFile section */ - 4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */; }; + 4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D19C1C01DC110FA008D8B38 /* BNCXcode7Support.h */; settings = {ATTRIBUTES = (Public, ); }; }; 4D19C1C31DC110FB008D8B38 /* BNCXcode7Support.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D19C1C11DC110FB008D8B38 /* BNCXcode7Support.m */; }; 4D291AAB1E322ECC007ED118 /* NSMutableDictionary+Branch.h in Headers */ = {isa = PBXBuildFile; fileRef = 4D291AA91E322ECC007ED118 /* NSMutableDictionary+Branch.h */; }; 4D291AAC1E322ECC007ED118 /* NSMutableDictionary+Branch.m in Sources */ = {isa = PBXBuildFile; fileRef = 4D291AAA1E322ECC007ED118 /* NSMutableDictionary+Branch.m */; }; @@ -372,6 +372,7 @@ E230A1851D03DB9E006181D8 /* Branch-SDK-Prefix.pch in Headers */, 4DB5673A1E79FDAF00A8A324 /* BranchShareLink.h in Headers */, E230A1B61D03DB9F006181D8 /* BranchSpotlightUrlRequest.h in Headers */, + 4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */, E230A1AA1D03DB9E006181D8 /* BranchOpenRequest.h in Headers */, E230A1B01D03DB9E006181D8 /* BranchSetIdentityRequest.h in Headers */, E230A16F1D03DB9E006181D8 /* BNCDeviceInfo.h in Headers */, @@ -387,7 +388,6 @@ E230A16D1D03DB9E006181D8 /* BNCContentDiscoveryManager.h in Headers */, E230A1711D03DB9E006181D8 /* BNCEncodingUtils.h in Headers */, E230A1981D03DB9E006181D8 /* BNCServerRequest.h in Headers */, - 4D19C1C21DC110FB008D8B38 /* BNCXcode7Support.h in Headers */, E230A1AC1D03DB9E006181D8 /* BranchRedeemRewardsRequest.h in Headers */, E230A1AE1D03DB9E006181D8 /* BranchRegisterViewRequest.h in Headers */, 4D291AAB1E322ECC007ED118 /* NSMutableDictionary+Branch.h in Headers */, diff --git a/carthage-files/Info.plist b/carthage-files/Info.plist index 8aaccf0b2..f59fe003c 100644 --- a/carthage-files/Info.plist +++ b/carthage-files/Info.plist @@ -15,11 +15,11 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 0.14.11 + 0.14.12 CFBundleSignature ???? CFBundleVersion - 0.14.11 + 0.14.12 NSPrincipalClass diff --git a/checksum b/checksum index ce23df145..3dddb6b69 100644 --- a/checksum +++ b/checksum @@ -1,4 +1,4 @@ #checksum for Branch-iOS-SDK found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-SDK.zip -bbd62798f1a270084e72695dc436e4ab0b4530e8 Branch-iOS-SDK.zip +56a627263f5f8a85a9f79f3925fa70c9eab9c938 Branch-iOS-SDK.zip #checksum for Branch-iOS-TestBed found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-TestBed.zip -5f387f0311b8d5950c91bb97efbd59b699b7bc09 Branch-iOS-TestBed.zip +0e8b62baca088670dfd939d89294661c0c3259df Branch-iOS-TestBed.zip diff --git a/scripts/version b/scripts/version index 30d9e98a0..02c231073 100755 --- a/scripts/version +++ b/scripts/version @@ -31,7 +31,7 @@ Options: USAGE } -version=0.14.11 +version=0.14.12 if (( $# == 0 )); then echo $version