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

Author: Edward Smith

Branch-SDK/Branch-SDK/BNCConfig.h

@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.16"
+#define SDK_VERSION             @"0.12.17"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV

Branch-SDK/Branch-SDK/Branch.m

@@ -1416,7 +1416,7 @@ + (NSString *)bundleIdentifier {
 }
 
 + (NSString *)kitDisplayVersion {
-	return @"0.12.16";
+	return @"0.12.17";
 }
 
 @end

Branch.framework/Versions/A/Branch

@@ -9,7 +9,7 @@
 #ifndef Branch_SDK_Config_h
 #define Branch_SDK_Config_h
 
-#define SDK_VERSION             @"0.12.16"
+#define SDK_VERSION             @"0.12.17"
 
 #define BNC_PROD_ENV
 //#define BNC_STAGE_ENV

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

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = "Branch"
-  s.version          = "0.12.16"
+  s.version          = "0.12.17"
   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,8 @@
 Branch iOS SDK Change Log
 
+- v0.12.17
+  * Made the preference file creation more robust and fault tolerant.
+
 - v0.12.16
   * Branch can now optionally track Apple Search Ad campaign attribution.
   * Sharing channels have been updated to be human readable and match the Android names.

ChangeLog.md

@@ -2,15 +2,21 @@
 Branch SDK Release Notes
 ========================
 
+Check the change log for specific fixes:  [Change log on Github.](https://github.com/BranchMetrics/ios-branch-deep-linking/blob/master/ChangeLog.md)
+
+####  Branch Version 0.12.17
+Crash fix due to preferences
+
+*  There are no breaking changes in this release.
+*  There are no significant new features in this release.
+
 ####  Branch Version 0.12.16
 Apple Search Ad Attribution
 
 *  Branch can now optionally track Apple Search Ad campaign attribution.
    See the documentation for using this feature in the README.md section
    [Apple Search Ad Attribution.](https://github.com/BranchMetrics/ios-branch-deep-linking/blob/master/README.md#apple-search-ads)
 
-*  Check the change log for specific fixes:  [Change log on Github.](https://github.com/BranchMetrics/ios-branch-deep-linking/blob/master/ChangeLog.md)
-
 ####  Branch Version 0.12.15
 Fixed a major crash bug.
 
@@ -21,28 +27,20 @@ Xcode 7 Support - Wednesday, October 26 2016
 
 *  This release fixes a compile error with Xcode 7.
 
-
 ####  Branch Version 0.12.13
 Better Match keys, Better Documentation - Tuesday, October 25 2016
 
 *  There are no breaking changes in this release.
-
 *  There are no significant new features in this release.
-
 *  Testing notes:  All fixes were bug fixes.  Make sure that existing tests run OK.
-
 *  Check the change log for specific fixes:  [Change log on Github.](https://github.com/BranchMetrics/ios-branch-deep-linking/blob/master/ChangeLog.md)
 
-
 ####  Branch Version 0.12.12
 Bug Fixes, Swift Updates, and iOS 10 Compatibility – Tuesday, October 11 2016
 
 *  There are no breaking changes in this release.
-
 *  The Swift example and documentation have been updated for Swift 3.0.
-
 *  We've diagnosed an open problem when Branch, Localytics, and Google Analytics are all used
    in the same app.  You can read the details and work-arounds in the Github issue
    [Branch, Localytics, and Google Analytics.](https://github.com/BranchMetrics/ios-branch-deep-linking/issues/485)
-
 *  Check the change log for specific fixes:  [Change log on Github.](https://github.com/BranchMetrics/ios-branch-deep-linking/blob/master/ChangeLog.md)

ReleaseNotes.md

@@ -1,4 +1,4 @@
 #checksum for Branch-iOS-SDK found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-SDK.zip
-8fc9a4b42c3f8195481142aae59c4445cff32acc  Branch-iOS-SDK.zip
+b1a4754ad473b86bc07e85bd4aeb9376f41010e7  Branch-iOS-SDK.zip
 #checksum for Branch-iOS-TestBed found at https://s3-us-west-1.amazonaws.com/branchhost/Branch-iOS-TestBed.zip
-2149cb71d303cf81e7173c3ae2eeb43a84fe021a  Branch-iOS-TestBed.zip
+dd4e0c71f5915c967333ac540a0180f6272965f6  Branch-iOS-TestBed.zip

checksum

@@ -39,7 +39,7 @@ iOS SDK Release Procedure
 5) Release on Fabric
     => New!! <=
     • On the command line, cd to 'ios-branch-deep-linking'.
-    • Run the script './scripts/deploy-fabric'.
+    • Run the script './scripts/deploy-fabric <version>'.
     • The script will compress and upload the framework, then the Fabric.app application will open.
     • Verify the deploy by going to the Fabric Mac app, choose 'Branch' and check the version number.
     • More details to be found here: https://github.com/twitterdev/3pk/wiki/Updating-SDKs
@@ -57,7 +57,7 @@ iOS SDK Release Procedure
 6) Release on Carthage
     => New!! <=
     • On the command line, cd to 'ios-branch-deep-linking'.
-    • Run the script './scripts/deploy-fabric'.
+    • Run the script './scripts/deploy-carthage'.
     • The script will check and compile the framework.  Then the web page
       'https://github.com/BranchMetrics/ios-branch-deep-linking/releases/new' will open.
 

iOS_SDK_Release_Procedure

@@ -35,7 +35,7 @@ git add --all
 git commit -m "Updates for $1 release."
 git tag $1
 ## git push --tags origin master
-git push --tags
+git push
 git checkout master
 git pull
 git pull origin QA
@@ -50,5 +50,5 @@ sh $SCRIPT_DIR/upload_zips.sh
 # Prompt for SDK Releases Group post
 echo "Inform the SDK Releases Group."
 echo "Subject: 'iOS SDK Release $1'"
-echo "   Body: The change log."
+echo "   Body: < The change log >"
 open 'https://groups.google.com/forum/#!newtopic/branch-sdk-releases'