Prep patch release 1.2.5

BranchMetrics · Oct 8, 2020 · 5f6642f · 5f6642f
1 parent 65041bc
commit 5f6642f
Show file tree

Hide file tree

Showing 8 changed files with 304 additions and 56 deletions.
diff --git a/Branch.xcodeproj/project.pbxproj b/Branch.xcodeproj/project.pbxproj
@@ -872,7 +872,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = R63EM248DP;
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
@@ -884,7 +884,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = R63EM248DP;
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};
@@ -972,7 +972,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				DEVELOPMENT_TEAM = R63EM248DP;
-				MARKETING_VERSION = 1.2.4;
+				MARKETING_VERSION = 1.2.5;
 				PRODUCT_BUNDLE_IDENTIFIER = io.branch.sdk.mac;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 			};

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 Branch Mac SDK Change Log
 
+## v1.2.5 - Oct 8, 2020
+* Allow short link generation when tracking is disabled
+
 ## v1.2.4 - June 17, 2020
 * Remove certificate pinning
 

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/Branch.h b/Frameworks/macOS/Branch.framework/Versions/A/Headers/Branch.h
@@ -26,7 +26,6 @@ FOUNDATION_EXPORT const unsigned char BranchVersionString[];
 #import <Branch/BranchMutableDictionary.h>
 #import <Branch/BranchSession.h>
 #import <Branch/BranchUniversalObject.h>
-#import <Branch/UIViewController+Branch.h>
 
 // Exposed private headers:
 #import <Branch/BNCLog.h>
diff --git a/Frameworks/macOS/Branch.framework/Versions/A/Headers/BranchHeader.h b/Frameworks/macOS/Branch.framework/Versions/A/Headers/BranchHeader.h
@@ -17,26 +17,10 @@
 #import <Foundation/Foundation.h>
 #endif
 
-#if TARGET_OS_OSX
-
-    #if __has_feature(modules)
-    @import AppKit;
-    #else
-    #import <AppKit/Appkit.h>
-    #endif
-
-#elif TARGET_OS_IPHONE
-
-    #if __has_feature(modules)
-    @import UIKit;
-    #else
-    #import <UIKit/UIKit.h>
-    #endif
-
+#if __has_feature(modules)
+@import AppKit;
 #else
-
-    #error Unknown compile target.
-
+#import <AppKit/Appkit.h>
 #endif
 
 #endif // BranchHeader_h
diff --git a/Frameworks/macOS/Branch.framework/Versions/A/Headers/UIViewController+Branch.h b/Frameworks/macOS/Branch.framework/Versions/A/Headers/UIViewController+Branch.h
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>19F101</string>
+	<string>19H2</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.4</string>
+	<string>1.2.5</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
@@ -27,17 +27,19 @@
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
-	<string>11E608c</string>
+	<string>12A7300</string>
+	<key>DTPlatformName</key>
+	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>GM</string>
+	<string>10.15.6</string>
 	<key>DTSDKBuild</key>
-	<string>19E258</string>
+	<string>19G68</string>
 	<key>DTSDKName</key>
 	<string>macosx10.15</string>
 	<key>DTXcode</key>
-	<string>1150</string>
+	<string>1201</string>
 	<key>DTXcodeBuild</key>
-	<string>11E608c</string>
+	<string>12A7300</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>10.10</string>
 	<key>NSHumanReadableCopyright</key>