Merge branch 'staging' of github.com:BranchMetrics/ios-branch-deep-linking into GH-892-validator-error

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCConfig.m

@@ -12,4 +12,4 @@
 BOOL       const BNC_API_PINNED      = YES;
 NSString * const BNC_API_VERSION     = @"v1";
 NSString * const BNC_LINK_URL        = @"https://bnc.lt";
-NSString * const BNC_SDK_VERSION     = @"0.25.8";
+NSString * const BNC_SDK_VERSION     = @"0.25.9";

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

@@ -938,8 +938,6 @@
 				7E6B3B4E1AA42D0E005F45BF /* Frameworks */,
 				7E6B3B4F1AA42D0E005F45BF /* Resources */,
 				4DF79403209B90B6003597E8 /* CopyFiles */,
-				3A7988C2912C03F642C32C3B /* [CP] Embed Pods Frameworks */,
-				AAD7E49B6EF1F7EE856C31D2 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -1060,36 +1058,6 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
-		3A7988C2912C03F642C32C3B /* [CP] Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Branch-SDK-Tests/Pods-Branch-SDK-Tests-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
-		AAD7E49B6EF1F7EE856C31D2 /* [CP] Copy Pods Resources */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "[CP] Copy Pods Resources";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Branch-SDK-Tests/Pods-Branch-SDK-Tests-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		B58A8EEAA66A7460C0BD3488 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

Branch-TestBed/Framework-Info.plist

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

Branch.framework/Info.plist

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

Branch.framework/Versions/A/Branch

@@ -462,7 +462,11 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 
 /**
  Call this method from inside your app delegate's `application:openURL:sourceApplication:annotation:`
- method with the so that Branch can open the passed URL.
+ method so that Branch can open the passed URL. This method is for pre-iOS 9 compatibility: If you don't need
+ pre-iOS 9 compatibility, override your app delegate's `application:openURL:options:` method instead and use
+ the Branch `application:openURL:options:` to open the URL.
+
+ @warning Pre-iOS 9 compatibility only.
 
  @param application         The application that was passed to your app delegate.
  @param url                 The URL that was passed to your app delegate.
@@ -476,12 +480,10 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
          annotation:(id)annotation;
 
 /**
- Call this method from inside your app delegate's `application:openURL:options:`
- method with the so that Branch can open the passed URL.
+ Call this method from inside your app delegate's `application:openURL:options:` method so that Branch can
+ open the passed URL.
 
- This method is functionally the same as calling the Branch method
- `application:openURL:sourceApplication:annotation:`. This method matches the new Apple appDelegate
- method for convenience.
+ This is the preferred Branch method to call inside your `application:openURL:options:` method.
 
  @param application         The application that was passed to your app delegate.
  @param url                 The URL that was passed to your app delegate.

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

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.25.8"
+  s.version          = "0.25.9"
   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?

Branch.podspec

@@ -1,5 +1,14 @@
 Branch iOS SDK Change Log
 
+- v0.25.9
+  
+* _*Master Release*_ - November 29, 2018
+  * DEVEX-826 Fix Unit Tests
+    - Fix blacklist unit test.
+    - Removed Swift 3 reference.
+  * Update project for Xcode 10.1
+  * Updated header doc and README for openURL:options: use. (#889)
+
 - v0.25.8
   * _*Master Release*_ - October 25, 2018
   * GH-873-Make-BranchCSSearchableItemAttributeSet-Public (#888)

ChangeLog.md

@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.25.8</string>
+	<string>0.25.9</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.25.8</string>
+	<string>0.25.9</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

carthage-files/Info.plist

@@ -1,4 +1,4 @@
 #checksum for Branch-iOS-SDK found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-SDK.zip
-65a80c94ae3a6e17475da2676254bc868a0875d0  Branch-iOS-SDK.zip
+56cb9f3675b4318933ada009f386e50ff8dbc26c  Branch-iOS-SDK.zip
 #checksum for Branch-iOS-TestBed found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-TestBed.zip
-13f5f05189e6e5394775ab45e134481f5954ad48  Branch-iOS-TestBed.zip
+2e5c70694d7241987bd134e35a5481807d34cd28  Branch-iOS-TestBed.zip