INTENG-10216 prepare patch release

BranchMetrics · Jun 18, 2020 · bf72353 · bf72353
1 parent ee76a0c
commit bf72353
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 26 deletions.
diff --git a/Branch.xcodeproj/project.pbxproj b/Branch.xcodeproj/project.pbxproj
@@ -1184,7 +1184,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
@@ -1196,7 +1196,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
@@ -1205,6 +1205,7 @@
 		4D67477120C74E81001639C5 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				SDKROOT = appletvos;
 			};
@@ -1213,6 +1214,7 @@
 		4D67477320C74E81001639C5 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				SDKROOT = appletvos;
 			};
@@ -1300,7 +1302,7 @@
 				CODE_SIGN_IDENTITY = "";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = "";
-				MARKETING_VERSION = 1.2.3;
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
@@ -1328,6 +1330,7 @@
 		4DFB135720CCD96400AF3E47 /* UnitTests */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
+				MARKETING_VERSION = 1.2.4;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				SDKROOT = appletvos;
 			};

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 Branch Mac SDK Change Log
 
+## v1.2.4 - June 17, 2020
+* Remove certificate pinning
+
 ## v1.2.3 - May 13, 2020
 * Fix control param location in request payload
 

diff --git a/Frameworks/macOS/Branch.framework/Versions/A/Branch b/Frameworks/macOS/Branch.framework/Versions/A/Branch
diff --git a/Frameworks/macOS/Branch.framework/Versions/A/Headers/BranchMainClass.h b/Frameworks/macOS/Branch.framework/Versions/A/Headers/BranchMainClass.h
@@ -31,13 +31,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype) initWithKey:(NSString*)key NS_DESIGNATED_INITIALIZER;
 
 /** Your Branch key. */
-@property (atomic, strong) NSString*key;
-
-/** Use certificate pinning for extra security. The default is to use certificate pinning. */
-@property (atomic, assign) BOOL useCertificatePinning;
+@property (atomic, strong) NSString *key;
 
 /** The URL to the Branch API servers. */
-@property (atomic, copy)   NSString*branchAPIServiceURL;
+@property (atomic, copy)   NSString *branchAPIServiceURL;
 
 /**
  This is `Class` for the network service. If you want to use your own underlying network service,

diff --git a/Frameworks/macOS/Branch.framework/Versions/A/Headers/BranchNetworkServiceProtocol.h b/Frameworks/macOS/Branch.framework/Versions/A/Headers/BranchNetworkServiceProtocol.h
@@ -91,10 +91,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (id<BNCNetworkOperationProtocol>) networkOperationWithURLRequest:(NSMutableURLRequest*)request
                 completion:(void (^)(id<BNCNetworkOperationProtocol>operation))completion;
 
-/// Pins the session to the array of public keys.
-@optional
-- (NSError*_Nullable) pinSessionToPublicSecKeyRefs:(NSArray/* <SecKeyRef> */*_Nullable)publicKeys;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Frameworks/macOS/Branch.framework/Versions/A/Resources/Info.plist b/Frameworks/macOS/Branch.framework/Versions/A/Resources/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>19E287</string>
+	<string>19F101</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.3</string>
+	<string>1.2.4</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,17 +27,17 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11E503a</string>
+	<string>11E608c</string>
 	<key>DTPlatformVersion</key>
 	<string>GM</string>
 	<key>DTSDKBuild</key>
 	<string>19E258</string>
 	<key>DTSDKName</key>
 	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1141</string>
+	<string>1150</string>
 	<key>DTXcodeBuild</key>
-	<string>11E503a</string>
+	<string>11E608c</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.10</string>
 	<key>NSHumanReadableCopyright</key>

diff --git a/Frameworks/tvOS/Branch.framework/Branch b/Frameworks/tvOS/Branch.framework/Branch
diff --git a/Frameworks/tvOS/Branch.framework/Headers/BranchMainClass.h b/Frameworks/tvOS/Branch.framework/Headers/BranchMainClass.h
@@ -31,13 +31,10 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype) initWithKey:(NSString*)key NS_DESIGNATED_INITIALIZER;
 
 /** Your Branch key. */
-@property (atomic, strong) NSString*key;
-
-/** Use certificate pinning for extra security. The default is to use certificate pinning. */
-@property (atomic, assign) BOOL useCertificatePinning;
+@property (atomic, strong) NSString *key;
 
 /** The URL to the Branch API servers. */
-@property (atomic, copy)   NSString*branchAPIServiceURL;
+@property (atomic, copy)   NSString *branchAPIServiceURL;
 
 /**
  This is `Class` for the network service. If you want to use your own underlying network service,

diff --git a/Frameworks/tvOS/Branch.framework/Headers/BranchNetworkServiceProtocol.h b/Frameworks/tvOS/Branch.framework/Headers/BranchNetworkServiceProtocol.h
@@ -91,10 +91,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (id<BNCNetworkOperationProtocol>) networkOperationWithURLRequest:(NSMutableURLRequest*)request
                 completion:(void (^)(id<BNCNetworkOperationProtocol>operation))completion;
 
-/// Pins the session to the array of public keys.
-@optional
-- (NSError*_Nullable) pinSessionToPublicSecKeyRefs:(NSArray/* <SecKeyRef> */*_Nullable)publicKeys;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Frameworks/tvOS/Branch.framework/Info.plist b/Frameworks/tvOS/Branch.framework/Info.plist