Merge branch 'master' of github.com:BranchMetrics/ios-branch-deep-linking into staging

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCAvailability.h

@@ -23,8 +23,3 @@ typedef NSString * UIApplicationOpenURLOptionsKey;
 #ifndef NS_STRING_ENUM
 #define NS_STRING_ENUM
 #endif
-
-@interface NSLocale (BranchAvailability)
-- (NSString*) countryCode;
-- (NSString*) languageCode;
-@end

Branch-SDK/Branch-SDK/BNCDeviceInfo.m

@@ -25,6 +25,12 @@
 #import <arpa/inet.h>
 #import <netinet/in.h>
 
+// Forward declare this for older versions of iOS
+@interface NSLocale (BranchAvailability)
+- (NSString*) countryCode;
+- (NSString*) languageCode;
+@end
+
 #pragma mark BRNNetworkInfo
 
 typedef NS_ENUM(NSInteger, BNCNetworkAddressType) {

Branch-TestBed/Branch-TestBed/ViewController.m

@@ -423,8 +423,11 @@ - (void) sendV2EventWithName:(NSString*)eventName {
     buo.contentMetadata.latitude         = 12.07;
     buo.contentMetadata.longitude        = -97.5;
     buo.contentMetadata.imageCaptions    = (id) @[@"my_img_caption1", @"my_img_caption_2"];
-    buo.contentMetadata.customMetadata   = (id) @{@"Custom_Content_metadata_key1": @"Custom_Content_metadata_val1"};
-    buo.title                       = @"My Content Title";
+    buo.contentMetadata.customMetadata   = (id) @{
+        @"Custom_Content_metadata_key1": @"Custom_Content_metadata_val1",
+        @"~campaign": @"Parul's campaign"
+    };
+    buo.title                       = @"Parul Title";
     buo.canonicalIdentifier         = @"item/12345";
     buo.canonicalUrl                = @"https://branch.io/deepviews";
     buo.keywords                    = @[@"My_Keyword1", @"My_Keyword2"];

Branch.framework/Info.plist

@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.21.14</string>
+	<string>0.21.16</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.21.14</string>
+	<string>0.21.16</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>

Branch.framework/Versions/A/Branch

@@ -23,8 +23,3 @@ typedef NSString * UIApplicationOpenURLOptionsKey;
 #ifndef NS_STRING_ENUM
 #define NS_STRING_ENUM
 #endif
-
-@interface NSLocale (BranchAvailability)
-- (NSString*) countryCode;
-- (NSString*) languageCode;
-@end

Branch.framework/Versions/A/Headers/BNCAvailability.h

@@ -48,6 +48,7 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void);
 @property (strong, nonatomic) NSString *browserUserAgentString;
 @property (strong, atomic) NSString *referringURL;
 @property (strong, atomic) NSString *branchAPIURL;
+@property (assign, atomic) BOOL      limitFacebookTracking;
 
 + (BNCPreferenceHelper *)preferenceHelper;
 

Branch.framework/Versions/A/Headers/BNCPreferenceHelper.h

@@ -124,7 +124,6 @@ extern NSString * const BNCCanonicalIdList;
 extern NSString * const BNCPurchaseAmount;
 extern NSString * const BNCPurchaseCurrency;
 extern NSString * const BNCCanonicalIdList;
-extern NSString * const BNCPurchaseAmount;
 extern NSString * const BNCRegisterViewEvent;
 extern NSString * const BNCAddToWishlistEvent;
 extern NSString * const BNCAddToCartEvent;

Branch.framework/Versions/A/Headers/Branch.h

@@ -239,14 +239,11 @@ FOUNDATION_EXPORT BranchCondition _Nonnull BranchConditionRefurbished;
 
 - (void)removeFromSpotlightWithCallback:(void (^_Nullable)(NSError * _Nullable error))completion;
 
-/// Convenience method for initSession methods that return BranchUniversalObject, but can be used safely by anyone.
-+ (nonnull BranchUniversalObject *)getBranchUniversalObjectFromDictionary:(nonnull NSDictionary *)dictionary;
-
-- (NSDictionary*_Nonnull)getParamsForServerRequest;
 - (NSDictionary*_Nonnull)getDictionaryWithCompleteLinkProperties:(BranchLinkProperties*_Nonnull)linkProperties;
 - (NSDictionary*_Nonnull)getParamsForServerRequestWithAddedLinkProperties:(BranchLinkProperties*_Nonnull)linkProperties;
 
-- (NSDictionary*_Nonnull) dictionary;
+/// Convenience method for initSession methods that return BranchUniversalObject, but can be used safely by anyone.
+- (NSMutableDictionary*_Nonnull) dictionary;
 + (BranchUniversalObject*_Nonnull) objectWithDictionary:(NSDictionary*_Null_unspecified)dictionary;
 
 - (NSString*_Nonnull) description;

Branch.framework/Versions/A/Headers/BranchUniversalObject.h

@@ -2,10 +2,12 @@ Branch iOS SDK Change Log
 
 - v0.21.16
   * _*Master Release*_ - December 18, 2017
-  * Fixed the BranchUniversalObject for v2-events & Updated the UITestBed. (#768)
-  * Fix update / install tracking when app installed but not run for a while. (#763)
-  * Added some code for Will's AppsFlyer integration. (#767)
+  * Fixed the BranchUniversalObject for v2-events & updated the UITestBed. (#768)
+  * Fixed update / install tracking when app installed but not run for a while. (#763)
+  * Added some code for Will's AppsFlyer integration in the Swift test bed. (#767)
   * Added `limit_facebook_tracking` to allow developers to opt-out of Facebook app tracking (AIS-417).
+  * Moved the forward declaration of `[NSLocal countryCode]` so that it doesn't interfere with
+    newer Swift compilations.
 
 - v0.21.14
   * _*Master Release*_ - December 8, 2017