Skip to content

Commit 8a9a65b

Browse files
committed
CORE-2088 remove overwrite, it's confusing. Also prep maintenance release.
1 parent 64403da commit 8a9a65b

File tree

10 files changed

+18
-30
lines changed

10 files changed

+18
-30
lines changed

Branch-SDK/BNCConfig.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@
1111
NSString * const BNC_API_BASE_URL = @"https://api2.branch.io";
1212
NSString * const BNC_API_VERSION = @"v1";
1313
NSString * const BNC_LINK_URL = @"https://bnc.lt";
14-
NSString * const BNC_SDK_VERSION = @"1.39.3";
14+
NSString * const BNC_SDK_VERSION = @"1.39.4";

Branch-SDK/BNCPasteboard.m

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,15 +29,6 @@ - (instancetype)init {
2929
return self;
3030
}
3131

32-
- (void)clearPasteboard {
33-
#if !TARGET_OS_TV
34-
if (@available(iOS 10.0, *)) {
35-
// cannot delete items from the pasteboard, but we can put something else on there
36-
[[UIPasteboard generalPasteboard] setString:@""];
37-
}
38-
#endif
39-
}
40-
4132
- (BOOL)isUrlOnPasteboard {
4233
#if !TARGET_OS_TV
4334
if (@available(iOS 10.0, *)) {
@@ -55,7 +46,6 @@ - (nullable NSURL *)checkForBranchLink {
5546
// triggers the end user toast message
5647
NSURL *tmp = UIPasteboard.generalPasteboard.URL;
5748
if ([Branch isBranchLink:tmp.absoluteString]) {
58-
[self clearPasteboard];
5949
return tmp;
6050
}
6151
#endif

Branch-TestBed/Branch-SDK-Tests/BNCPasteboardTests.m

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,7 @@ - (void)testCheckForBranchLink {
129129
NSURL *tmp = [[BNCPasteboard sharedInstance] checkForBranchLink];
130130
XCTAssert([self.testBranchURL.absoluteString isEqualToString:tmp.absoluteString]);
131131

132-
// confirms Branch link is deleted after use
133-
XCTAssertFalse([[BNCPasteboard sharedInstance] isUrlOnPasteboard]);
132+
[self clearPasteboard];
134133
}
135134

136135
- (void)testCheckForBranchLink_nonBranchLink {
@@ -140,12 +139,7 @@ - (void)testCheckForBranchLink_nonBranchLink {
140139
NSURL *tmp = [[BNCPasteboard sharedInstance] checkForBranchLink];
141140
XCTAssertNil(tmp);
142141

143-
// confirms non-Branch link is still on the pasteboard
144-
XCTAssertTrue([[BNCPasteboard sharedInstance] isUrlOnPasteboard]);
145-
146-
// deletes non-Branch link from pasteboard
147142
[self clearPasteboard];
148-
XCTAssertFalse([[BNCPasteboard sharedInstance] isUrlOnPasteboard]);
149143
}
150144

151145
- (void)testCheckForBranchLink_noLink {

Branch-TestBed/Framework-Info.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@
1717
<key>CFBundlePackageType</key>
1818
<string>FMWK</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.39.3</string>
20+
<string>1.39.4</string>
2121
<key>CFBundleSignature</key>
2222
<string>????</string>
2323
<key>CFBundleVersion</key>
24-
<string>1.39.3</string>
24+
<string>1.39.4</string>
2525
<key>LSRequiresIPhoneOS</key>
2626
<true/>
2727
<key>NSHumanReadableCopyright</key>

Branch.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "Branch"
3-
s.version = "1.39.3"
3+
s.version = "1.39.4"
44
s.summary = "Create an HTTP URL for any piece of content in your app"
55
s.description = <<-DESC
66
- Want the highest possible conversions on your sharing feature?

ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
Branch iOS SDK Change Log
22

3+
v1.39.4
4+
CORE-2088 Add support for deferred deeplinks via pasteboard. This is not enabled by default.
5+
CORE-1950 Record install referrer
6+
37
v1.39.3
48
CORE-1893 Add timeout to Apple attribution token. Some users are reporting the call can hang.
59

carthage-files/BranchSDK.xcodeproj/project.pbxproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,7 @@
16051605
"@executable_path/Frameworks",
16061606
"@loader_path/Frameworks",
16071607
);
1608-
MARKETING_VERSION = 1.39.3;
1608+
MARKETING_VERSION = 1.39.4;
16091609
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
16101610
MTL_FAST_MATH = YES;
16111611
ONLY_ACTIVE_ARCH = YES;
@@ -1645,7 +1645,7 @@
16451645
"@executable_path/Frameworks",
16461646
"@loader_path/Frameworks",
16471647
);
1648-
MARKETING_VERSION = 1.39.3;
1648+
MARKETING_VERSION = 1.39.4;
16491649
MTL_FAST_MATH = YES;
16501650
ONLY_ACTIVE_ARCH = NO;
16511651
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1681,7 +1681,7 @@
16811681
);
16821682
MACH_O_TYPE = staticlib;
16831683
MACOSX_DEPLOYMENT_TARGET = 10.15;
1684-
MARKETING_VERSION = 1.39.3;
1684+
MARKETING_VERSION = 1.39.4;
16851685
ONLY_ACTIVE_ARCH = YES;
16861686
OTHER_LDFLAGS = "-ObjC";
16871687
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1714,7 +1714,7 @@
17141714
);
17151715
MACH_O_TYPE = staticlib;
17161716
MACOSX_DEPLOYMENT_TARGET = 10.15;
1717-
MARKETING_VERSION = 1.39.3;
1717+
MARKETING_VERSION = 1.39.4;
17181718
ONLY_ACTIVE_ARCH = NO;
17191719
OTHER_LDFLAGS = "-ObjC";
17201720
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1873,7 +1873,7 @@
18731873
"@loader_path/Frameworks",
18741874
);
18751875
MACOSX_DEPLOYMENT_TARGET = 10.15;
1876-
MARKETING_VERSION = 1.39.3;
1876+
MARKETING_VERSION = 1.39.4;
18771877
ONLY_ACTIVE_ARCH = YES;
18781878
OTHER_LDFLAGS = "-ObjC";
18791879
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;
@@ -1904,7 +1904,7 @@
19041904
"@loader_path/Frameworks",
19051905
);
19061906
MACOSX_DEPLOYMENT_TARGET = 10.15;
1907-
MARKETING_VERSION = 1.39.3;
1907+
MARKETING_VERSION = 1.39.4;
19081908
ONLY_ACTIVE_ARCH = NO;
19091909
OTHER_LDFLAGS = "-ObjC";
19101910
PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch;

carthage-files/checksum

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#checksum for Branch.zip on Github
2-
b325b48cdcc2a6b7e9c0fdda22d911d1423812dd Branch.zip
2+
8ad25b9ffb7e93c34fb75f0009b19de940828387 Branch.zip

carthage-files/checksum_static

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#checksum for Branch_static.zip on Github
2-
fc80baaaa34dab5dcc2eb7c55df8f2f433d71de8 Branch_static.zip
2+
2de15f43cd7cc6a01c377d80a8d93637bcba5a6b Branch_static.zip

scripts/version.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ Options:
3131
USAGE
3232
}
3333

34-
version=1.39.3
34+
version=1.39.4
3535

3636
if (( $# == 0 )); then
3737
echo $version

0 commit comments

Comments
 (0)