Skip to content

Commit ea74f1a

Browse files
echo-branchecho-branch
committed
SDK-471 update the frameworks and version for release
1 parent 4ba3706 commit ea74f1a

File tree

12 files changed

+53
-42
lines changed

12 files changed

+53
-42
lines changed

‎Branch.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,6 @@
218218
5FA17909232702F10012B500 /* BNCUserAgentCollector.h in Headers */ = {isa = PBXBuildFile; fileRef = 5FA17907232702F00012B500 /* BNCUserAgentCollector.h */; };
219219
5FA1791723270F2B0012B500 /* BNCUserAgentCollector.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FA17908232702F00012B500 /* BNCUserAgentCollector.m */; };
220220
5FA313A22327107B007BAA6A /* BNCUserAgentCollector.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FA17908232702F00012B500 /* BNCUserAgentCollector.m */; };
221-
5FA313A32327107B007BAA6A /* BNCUserAgentCollector.m in Sources */ = {isa = PBXBuildFile; fileRef = 5FA17908232702F00012B500 /* BNCUserAgentCollector.m */; };
222221
/* End PBXBuildFile section */
223222

224223
/* Begin PBXFileReference section */
@@ -926,7 +925,6 @@
926925
isa = PBXSourcesBuildPhase;
927926
buildActionMask = 2147483647;
928927
files = (
929-
5FA313A32327107B007BAA6A /* BNCUserAgentCollector.m in Sources */,
930928
4D67473E20C74E81001639C5 /* BranchUniversalObject.m in Sources */,
931929
4DF34EA1210BC04B00E5D20C /* UIViewController+Branch.m in Sources */,
932930
4D67474020C74E81001639C5 /* BranchCommerce.m in Sources */,

‎Branch.xcodeproj/xcshareddata/xcschemes/Branch-macOS.xcscheme‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,21 +40,9 @@
4040
buildConfiguration = "UnitTests"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES"
4344
enableUBSanitizer = "YES"
44-
codeCoverageEnabled = "YES"
45-
shouldUseLaunchSchemeArgsEnv = "YES">
46-
<Testables>
47-
<TestableReference
48-
skipped = "NO">
49-
<BuildableReference
50-
BuildableIdentifier = "primary"
51-
BlueprintIdentifier = "4D159DCA20B62D7D005A9850"
52-
BuildableName = "BranchTests.xctest"
53-
BlueprintName = "BranchTests"
54-
ReferencedContainer = "container:Branch.xcodeproj">
55-
</BuildableReference>
56-
</TestableReference>
57-
</Testables>
45+
codeCoverageEnabled = "YES">
5846
<MacroExpansion>
5947
<BuildableReference
6048
BuildableIdentifier = "primary"
@@ -71,6 +59,18 @@
7159
isEnabled = "YES">
7260
</AdditionalOption>
7361
</AdditionalOptions>
62+
<Testables>
63+
<TestableReference
64+
skipped = "NO">
65+
<BuildableReference
66+
BuildableIdentifier = "primary"
67+
BlueprintIdentifier = "4D159DCA20B62D7D005A9850"
68+
BuildableName = "BranchTests.xctest"
69+
BlueprintName = "BranchTests"
70+
ReferencedContainer = "container:Branch.xcodeproj">
71+
</BuildableReference>
72+
</TestableReference>
73+
</Testables>
7474
</TestAction>
7575
<LaunchAction
7676
buildConfiguration = "Debug"
@@ -91,8 +91,6 @@
9191
ReferencedContainer = "container:Branch.xcodeproj">
9292
</BuildableReference>
9393
</MacroExpansion>
94-
<AdditionalOptions>
95-
</AdditionalOptions>
9694
</LaunchAction>
9795
<ProfileAction
9896
buildConfiguration = "Release"

‎Branch.xcodeproj/xcshareddata/xcschemes/Branch-tvOS.xcscheme‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -40,22 +40,10 @@
4040
buildConfiguration = "UnitTests"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
shouldUseLaunchSchemeArgsEnv = "YES"
4344
enableThreadSanitizer = "YES"
4445
enableUBSanitizer = "YES"
45-
codeCoverageEnabled = "YES"
46-
shouldUseLaunchSchemeArgsEnv = "YES">
47-
<Testables>
48-
<TestableReference
49-
skipped = "NO">
50-
<BuildableReference
51-
BuildableIdentifier = "primary"
52-
BlueprintIdentifier = "4D159DCA20B62D7D005A9850"
53-
BuildableName = "BranchTests.xctest"
54-
BlueprintName = "BranchTests"
55-
ReferencedContainer = "container:Branch.xcodeproj">
56-
</BuildableReference>
57-
</TestableReference>
58-
</Testables>
46+
codeCoverageEnabled = "YES">
5947
<MacroExpansion>
6048
<BuildableReference
6149
BuildableIdentifier = "primary"
@@ -72,6 +60,18 @@
7260
isEnabled = "YES">
7361
</AdditionalOption>
7462
</AdditionalOptions>
63+
<Testables>
64+
<TestableReference
65+
skipped = "NO">
66+
<BuildableReference
67+
BuildableIdentifier = "primary"
68+
BlueprintIdentifier = "4D159DCA20B62D7D005A9850"
69+
BuildableName = "BranchTests.xctest"
70+
BlueprintName = "BranchTests"
71+
ReferencedContainer = "container:Branch.xcodeproj">
72+
</BuildableReference>
73+
</TestableReference>
74+
</Testables>
7575
</TestAction>
7676
<LaunchAction
7777
buildConfiguration = "Debug"
@@ -92,8 +92,6 @@
9292
ReferencedContainer = "container:Branch.xcodeproj">
9393
</BuildableReference>
9494
</MacroExpansion>
95-
<AdditionalOptions>
96-
</AdditionalOptions>
9795
</LaunchAction>
9896
<ProfileAction
9997
buildConfiguration = "Release"

‎Branch/BNCDevice.m‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
#import "BNCDevice.h"
1212
#import "BNCLog.h"
1313
#import "BNCNetworkInformation.h"
14+
#if !TARGET_OS_TV
1415
#import "BNCUserAgentCollector.h"
16+
#endif
1517

1618
#import <sys/sysctl.h>
1719
#import <CommonCrypto/CommonCrypto.h>
@@ -246,7 +248,9 @@ + (instancetype) createCurrentDevice {
246248
device->_country = [self country];
247249
device->_language = [self language];
248250

251+
#if !TARGET_OS_TV
249252
device->_userAgent = [BNCUserAgentCollector instance].userAgent;
253+
#endif
250254

251255
return device;
252256
}

‎Branch/BranchMainClass.m‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
#import "UIViewController+Branch.h"
2626

2727
#import "BNCDevice.h"
28+
29+
#if !TARGET_OS_TV
2830
#import "BNCUserAgentCollector.h"
31+
#endif
2932

3033
#pragma mark BranchConfiguration
3134

@@ -141,9 +144,11 @@ + (NSString *)kitDisplayVersion {
141144
- (Branch*) startWithConfiguration:(BranchConfiguration*)configuration {
142145

143146
// This as it relies on startDelayedOpenTimer to beat all the network calls in a race.
147+
#if !TARGET_OS_TV
144148
[[BNCUserAgentCollector instance] loadUserAgentWithCompletion:^(NSString * _Nullable userAgent) {
145149

146150
}];
151+
#endif
147152

148153
// These function references force the linker to load the categories just in case it forgot.
149154
BNCForceNSErrorCategoryToLoad();

‎Branch/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<key>CFBundlePackageType</key>
1616
<string>FMWK</string>
1717
<key>CFBundleShortVersionString</key>
18-
<string>1.1.0</string>
18+
<string>1.2.0</string>
1919
<key>CFBundleVersion</key>
2020
<string>1</string>
2121
<key>NSHumanReadableCopyright</key>

‎BranchTests/BNCUserAgentCollectorTests.m‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
// Created by Ernest Cho on 8/29/19.
66
// Copyright © 2019 Branch, Inc. All rights reserved.
77
//
8+
#if !TARGET_OS_TV
89

910
#import <XCTest/XCTest.h>
1011
#import "BNCUserAgentCollector.h"
@@ -118,3 +119,4 @@ - (void)testLoadUserAgent_FilledDataStore {
118119
}
119120

120121
@end
122+
#endif

‎CHANGELOG.md‎

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

3+
## v1.2.0 - October 7, 2019
4+
* Add user agent
5+
* Attribution fixes
6+
37
## v1.1.0 - December 6th, 2018
48
* Added tvOS support
59
* Added CocoaPod support

‎Frameworks/macOS/Branch.framework/Versions/A/Branch‎

52.9 KB
Binary file not shown.

‎Frameworks/macOS/Branch.framework/Versions/A/Resources/Info.plist‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<plist version="1.0">
44
<dict>
55
<key>BuildMachineOSBuild</key>
6-
<string>17G3025</string>
6+
<string>18G95</string>
77
<key>CFBundleDevelopmentRegion</key>
88
<string>en</string>
99
<key>CFBundleExecutable</key>
@@ -17,7 +17,7 @@
1717
<key>CFBundlePackageType</key>
1818
<string>FMWK</string>
1919
<key>CFBundleShortVersionString</key>
20-
<string>1.1.0</string>
20+
<string>1.2.0</string>
2121
<key>CFBundleSupportedPlatforms</key>
2222
<array>
2323
<string>MacOSX</string>
@@ -27,17 +27,19 @@
2727
<key>DTCompiler</key>
2828
<string>com.apple.compilers.llvm.clang.1_0</string>
2929
<key>DTPlatformBuild</key>
30-
<string>10B61</string>
30+
<string>11A1027</string>
3131
<key>DTPlatformVersion</key>
3232
<string>GM</string>
3333
<key>DTSDKBuild</key>
34-
<string>18B71</string>
34+
<string>19A547</string>
3535
<key>DTSDKName</key>
36-
<string>macosx10.14</string>
36+
<string>macosx10.15</string>
3737
<key>DTXcode</key>
38-
<string>1010</string>
38+
<string>1110</string>
3939
<key>DTXcodeBuild</key>
40-
<string>10B61</string>
40+
<string>11A1027</string>
41+
<key>LSMinimumSystemVersion</key>
42+
<string>10.10</string>
4143
<key>NSHumanReadableCopyright</key>
4244
<string>Copyright © 2018 Branch. All rights reserved.</string>
4345
</dict>

0 commit comments

Comments
 (0)