Version 0.24.2. Updated some tests.

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.24.1";
+NSString * const BNC_SDK_VERSION     = @"0.24.2";

Branch-TestBed/Branch-SDK-Tests/BNCKeyChain.Test.m

@@ -28,7 +28,7 @@ - (void)testKeyChain {
 
     error = [BNCKeyChain removeValuesForService:nil key:nil];
     if (systemVersion >= 10.0 && systemVersion < 11.0)
-        { XCTAssertTrue(error.code == -34018); }
+        { XCTAssertTrue(error == nil || error.code == -34018); }
     else
         { XCTAssertTrue(error == nil); }
 

Branch-TestBed/Framework-Info.plist

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

Branch.podspec

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

ChangeLog.md

@@ -1,7 +1,7 @@
 Branch iOS SDK Change Log
 
 - v0.24.2
-  * _*Master Release*_ - April 20, 2018
+  * _*Master Release*_ - April 21, 2018
   * Fixed a bug where a opening a blacklisted URI scheme would cause an HTTP status 400 for each
     Branch open until the app was opened with a universal link (DEVEX-341).
     - After opening a blacklisted scheme, the app would not open other schemes until a https URL was opened.

Examples/WebViewExample/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - Branch (0.24.0):
-    - Branch/Core (= 0.24.0)
-  - Branch/Core (0.24.0)
+  - Branch (0.24.1):
+    - Branch/Core (= 0.24.1)
+  - Branch/Core (0.24.1)
   - Cartography (3.0.1)
   - MBProgressHUD (1.1.0)
 
@@ -10,15 +10,20 @@ DEPENDENCIES:
   - Cartography
   - MBProgressHUD
 
+SPEC REPOS:
+  https://github.com/CocoaPods/Specs.git:
+    - Cartography
+    - MBProgressHUD
+
 EXTERNAL SOURCES:
   Branch:
-    :path: ../..
+    :path: "../.."
 
 SPEC CHECKSUMS:
-  Branch: b4e9cfd1d75e230df3d4fb8d738b290c94e7a576
+  Branch: 1bc7254a71cc47d2a9edccfb6a308c11e6a8e7af
   Cartography: f8c899bb0f5cf20758644a8eea59a75e98a03a5d
   MBProgressHUD: e7baa36a220447d8aeb12769bf0585582f3866d9
 
 PODFILE CHECKSUM: 11c87f21f32687c987839149b04678394af64cd8
 
-COCOAPODS: 1.4.0
+COCOAPODS: 1.5.0

Examples/WebViewExample/WebViewExample.xcodeproj/project.pbxproj

@@ -180,7 +180,6 @@
 				7B3B977D1E8C1B650089C04B /* Frameworks */,
 				7B3B977E1E8C1B650089C04B /* Resources */,
 				B83EB663911AC8B2CA5E28B1 /* [CP] Embed Pods Frameworks */,
-				DF74DA356D0CBFBBC39E6377 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -287,21 +286,6 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		DF74DA356D0CBFBBC39E6377 /* [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-WebViewExample/Pods-WebViewExample-resources.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

carthage-files/Info.plist

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

scripts/test-unit-tests

@@ -43,7 +43,12 @@ stressTest=0
 # stressPhone="iPhone 4s"
 # stressOS="8.3"
 stressPhone="iPhone 7 Plus"
-stressOS="latest"
+if [ "$(xcodebuild -version | head -n1)" = "Xcode 9.3" ]
+then
+    stressOS="latest"
+else
+    stressOS="10.3.1"
+fi
 
 function testSimulatorStress() {
     if (( $stressTest == 0 )); then
@@ -93,15 +98,23 @@ fi
 
 cleanAll
 analyzeBuild
+printf "${textBlue}Running stress test with $stressPhone $stressOS.${textNormal}\n"
 for i in {1..5}
 do
     testSimulatorStress
 done
-testSimulatorVersion "iPhone X"  latest
-testSimulatorVersion "iPhone SE" latest
+if [ "$(xcodebuild -version | head -n1)" = "Xcode 9.3" ]
+then
+    testSimulatorVersion "iPhone X"  latest
+fi
+testSimulatorVersion "iPhone SE" "$stressOS"
 testSimulatorVersion "iPhone 6s" 10.0
 testSimulatorVersion "iPhone 5"  9.3
-testSimulatorVersion "iPhone 4s" 8.4
+# xctest doesn't work for iOS 8.4 in Xcode 9.3.  Bummer.
+if [ "$(xcodebuild -version | head -n1)" != "Xcode 9.3" ]
+then
+    testSimulatorVersion "iPhone 4s" 8.4
+fi
 
 elapsed=$(date -jur$SECONDS +%H:%M:%S)
 printf "${textBlue}All tests completed successfully. Elapsed: %s.${textNormal}\n" "$elapsed"

scripts/version

@@ -31,7 +31,7 @@ Options:
 USAGE
 }
 
-version=0.24.1
+version=0.24.2
 
 if (( $# == 0 )); then
     echo $version