Skip to content

Commit

Permalink
SDK-2179 Fix linker issue that causes crash on iOS 12 and iOS 13 when…
Browse files Browse the repository at this point in the history
… when using the binary framework
  • Loading branch information
echo-branch committed Nov 29, 2023
1 parent f98aedf commit b3ffdf2
Show file tree
Hide file tree
Showing 6 changed files with 37 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Branch-TestBed/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 829cf437db3e2065c6c17ddea2f24b51cb0aecc0

COCOAPODS: 1.11.3
COCOAPODS: 1.14.3
2 changes: 1 addition & 1 deletion BranchSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "BranchSDK"
s.version = "2.1.2"
s.version = "2.1.3"
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?
Expand Down
32 changes: 26 additions & 6 deletions BranchSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -2093,7 +2093,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.1.2;
MARKETING_VERSION = 2.1.3;
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -2124,7 +2124,11 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.1.2;
MARKETING_VERSION = 2.1.3;
OTHER_LDFLAGS = (
"-weak_framework",
LinkPresentation,
);
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -2326,7 +2330,11 @@
"@loader_path/Frameworks",
);
MACH_O_TYPE = staticlib;
MARKETING_VERSION = 2.1.2;
MARKETING_VERSION = 2.1.3;
OTHER_LDFLAGS = (
"-weak_framework",
LinkPresentation,
);
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
PRODUCT_MODULE_NAME = BranchSDK;
PRODUCT_NAME = BranchSDK;
Expand Down Expand Up @@ -2361,7 +2369,11 @@
"@loader_path/Frameworks",
);
MACH_O_TYPE = staticlib;
MARKETING_VERSION = 2.1.2;
MARKETING_VERSION = 2.1.3;
OTHER_LDFLAGS = (
"-weak_framework",
LinkPresentation,
);
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
PRODUCT_MODULE_NAME = BranchSDK;
PRODUCT_NAME = BranchSDK;
Expand Down Expand Up @@ -2393,7 +2405,11 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.1.2;
MARKETING_VERSION = 2.1.3;
OTHER_LDFLAGS = (
"-weak_framework",
LinkPresentation,
);
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
PRODUCT_NAME = BranchSDK;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down Expand Up @@ -2423,7 +2439,11 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 2.1.2;
MARKETING_VERSION = 2.1.3;
OTHER_LDFLAGS = (
"-weak_framework",
LinkPresentation,
);
PRODUCT_BUNDLE_IDENTIFIER = io.branch.BranchSDK;
PRODUCT_NAME = BranchSDK;
PROVISIONING_PROFILE_SPECIFIER = "";
Expand Down
2 changes: 1 addition & 1 deletion BranchSDK/BNCConfig.m
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
NSString * const BNC_API_BASE_URL = @"https://api2.branch.io";
NSString * const BNC_API_VERSION = @"v1";
NSString * const BNC_LINK_URL = @"https://bnc.lt";
NSString * const BNC_SDK_VERSION = @"2.1.2";
NSString * const BNC_SDK_VERSION = @"2.1.3";
7 changes: 6 additions & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
Branch iOS SDK Change Log

V.2.1.2
v.2.1.3
This version is for a hotfix on Xamarin, it will not ship as a general iOS release.

- SDK-2179 Fix LinkPresentation linker issue causing crash on Xamarin when run on iOS 12 or iOS 13. Thanks @LeadAssimilator.

v.2.1.2
Branch iOS SDK 2.1.2 adds additional support for Meta AEM links. It also includes some bug fixes and debugging improvements.

- SDK-1796, SDK-1797 and SDK-1906 additional support for Meta AEM links
Expand Down
4 changes: 2 additions & 2 deletions scripts/version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Options:
USAGE
}

version=2.1.2
version=2.1.3
prev_version="$version"

if (( $# == 0 )); then
Expand Down Expand Up @@ -107,7 +107,7 @@ if [[ $update ]]; then
sed -i '' -e "/^[[:space:]]*s\.version/ {s/\".*\"/\"$version\"/; }" ../BranchSDK.podspec

# Update framework version
sed -ie 's/MARKETING_VERSION = '"$prev_version"'/MARKETING_VERSION = '"$version"'/g' ../BranchSDK.xcodeproj/project.pbxproj
sed -i '' -e 's/MARKETING_VERSION = '"$prev_version"'/MARKETING_VERSION = '"$version"'/g' ../BranchSDK.xcodeproj/project.pbxproj
fi


Expand Down

0 comments on commit b3ffdf2

Please sign in to comment.