Skip to content

Commit 47dbfa4

Browse files
committed
Prep 0.32.0 release by cleaning up method comments and updating carthage target
1 parent a4b2c10 commit 47dbfa4

File tree

4 files changed

+25
-11
lines changed

4 files changed

+25
-11
lines changed

Branch-SDK/Branch-SDK/Branch.h

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -679,11 +679,9 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
679679
- (void)setNetworkTimeout:(NSTimeInterval)timeout;
680680

681681
/**
682-
Set disable_ad_network_callouts server flag. Default value is NO.
683-
684-
By calling this method with YES, the flag disable_ad_network_callouts = true will be set on all events for a user.
685-
Those events will not be sent to ad networks that have been specified by the customer on the dashboard.
686-
Customer is required to select the ad networks that the event should not be sent to on the dashboard in order for the flag to be effective.
682+
Disable callouts to ad networks for all events for a user; by default Branch sends callouts to ad networks.
683+
684+
By calling this method with YES, Branch will not send any events to the ad networks specified in your Branch account. If ad networks are not specified in your Branch account, this method will be ignored and events will still be sent.
687685
*/
688686
- (void)disableAdNetworkCallouts:(BOOL)disableCallouts;
689687

Branch-SDK/Branch-SDK/BranchEvent.h

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,19 @@ typedef NS_ENUM(NSInteger, BranchEventAdType) {
8989
@property (nonatomic, copy) NSDictionary<NSString*, NSString*> *_Nonnull customData;
9090

9191
/**
92-
Logs the event on the Branch server. This version will callback on success/failure.
92+
Logs the event on the Branch server.
93+
94+
This version will callback on success/failure.
9395
*/
9496
- (void)logEventWithCompletion:(void (^_Nullable)(BOOL success, NSError * _Nullable error))completion;
9597

96-
- (void) logEvent; //!< Logs the event on the Branch server. This version automatically caches and retries as necessary.
98+
/**
99+
Logs the event on the Branch server.
100+
101+
This version automatically caches and retries as necessary.
102+
*/
103+
- (void)logEvent;
104+
97105
- (NSDictionary*_Nonnull) dictionary; //!< Returns a dictionary representation of the event.
98106
- (NSString* _Nonnull) description; //!< Returns a string description of the event.
99107
@end

Branch-TestBed-Swift/TestBed-Swift.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -694,10 +694,10 @@
694694
);
695695
inputPaths = (
696696
"${PODS_ROOT}/Target Support Files/Pods-TestBed-Swift/Pods-TestBed-Swift-resources.sh",
697-
"${PODS_ROOT}/Amplitude-iOS/Amplitude/api.amplitude.com.der",
698-
"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der",
699-
"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaCA.der",
700-
"${PODS_ROOT}/Amplitude-iOS/Amplitude/ComodoRsaDomainValidationCA.der",
697+
"${PODS_ROOT}/Amplitude-iOS/Sources/Amplitude/api.amplitude.com.der",
698+
"${PODS_ROOT}/Amplitude-iOS/Sources/Amplitude/ComodoCaLimitedRsaCertificationAuthority.der",
699+
"${PODS_ROOT}/Amplitude-iOS/Sources/Amplitude/ComodoRsaCA.der",
700+
"${PODS_ROOT}/Amplitude-iOS/Sources/Amplitude/ComodoRsaDomainValidationCA.der",
701701
"${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKContentCards/Resources/ABKContentCardsStoryboard.storyboard",
702702
"${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKContentCards/Resources/ar.lproj/AppboyContentCardsLocalizable.strings",
703703
"${PODS_ROOT}/Appboy-iOS-SDK/AppboyUI/ABKContentCards/Resources/Base.lproj/AppboyContentCardsLocalizable.strings",

carthage-files/BranchSDK.xcodeproj/project.pbxproj

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@
8080
4DB5673A1E79FDAF00A8A324 /* BranchShareLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB567381E79FDAF00A8A324 /* BranchShareLink.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; };
8181
4DB5673B1E79FDAF00A8A324 /* BranchShareLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB567391E79FDAF00A8A324 /* BranchShareLink.m */; platformFilter = ios; };
8282
4DCF4B011F438A2B00AF9AAB /* BNCLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BD7C3D91F27CEDB003696AF /* BNCLog.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; };
83+
5F32D7C8242D323C000DE539 /* BNCCallbackMap.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F32D7C6242D323B000DE539 /* BNCCallbackMap.m */; };
84+
5F32D7C9242D323C000DE539 /* BNCCallbackMap.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F32D7C7242D323B000DE539 /* BNCCallbackMap.h */; };
8385
5F7DB5FB237C95C30077A95F /* BNCAppleAdClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F7DB5F9237C95C30077A95F /* BNCAppleAdClient.h */; platformFilter = ios; };
8486
5F7DB5FC237C95C30077A95F /* BNCAppleAdClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F7DB5FA237C95C30077A95F /* BNCAppleAdClient.m */; };
8587
5F8FC239236BB18A00B8474A /* BNCFacebookAppLinks.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F8FC235236BB18900B8474A /* BNCFacebookAppLinks.m */; };
@@ -228,6 +230,8 @@
228230
4DB328041FA10C6300ACF9B0 /* BranchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchEvent.m; sourceTree = "<group>"; };
229231
4DB567381E79FDAF00A8A324 /* BranchShareLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchShareLink.h; sourceTree = "<group>"; };
230232
4DB567391E79FDAF00A8A324 /* BranchShareLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchShareLink.m; sourceTree = "<group>"; };
233+
5F32D7C6242D323B000DE539 /* BNCCallbackMap.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCCallbackMap.m; sourceTree = "<group>"; };
234+
5F32D7C7242D323B000DE539 /* BNCCallbackMap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCCallbackMap.h; sourceTree = "<group>"; };
231235
5F7DB5F9237C95C30077A95F /* BNCAppleAdClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCAppleAdClient.h; sourceTree = "<group>"; };
232236
5F7DB5FA237C95C30077A95F /* BNCAppleAdClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCAppleAdClient.m; sourceTree = "<group>"; };
233237
5F8FC235236BB18900B8474A /* BNCFacebookAppLinks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCFacebookAppLinks.m; sourceTree = "<group>"; };
@@ -468,6 +472,8 @@
468472
4DAF63B91F86C26A006316E9 /* BranchDelegate.m */,
469473
4DB328031FA10C6200ACF9B0 /* BranchEvent.h */,
470474
4DB328041FA10C6300ACF9B0 /* BranchEvent.m */,
475+
5F32D7C7242D323B000DE539 /* BNCCallbackMap.h */,
476+
5F32D7C6242D323B000DE539 /* BNCCallbackMap.m */,
471477
E230A1381D03DB9E006181D8 /* BranchLinkProperties.h */,
472478
E230A1391D03DB9E006181D8 /* BranchLinkProperties.m */,
473479
4DB567381E79FDAF00A8A324 /* BranchShareLink.h */,
@@ -533,6 +539,7 @@
533539
4DAB17A01EE8A31B0079EEB4 /* BNCServerInterface.h in Headers */,
534540
4DAB17A61EE8A31B0079EEB4 /* BNCServerResponse.h in Headers */,
535541
4D1ED2811FB3A472007390A8 /* BNCSpotlightService.h in Headers */,
542+
5F32D7C9242D323C000DE539 /* BNCCallbackMap.h in Headers */,
536543
4DAB17A21EE8A31B0079EEB4 /* BNCServerRequest.h in Headers */,
537544
4DAB17A41EE8A31B0079EEB4 /* BNCServerRequestQueue.h in Headers */,
538545
E230A1861D03DB9E006181D8 /* Branch.h in Headers */,
@@ -713,6 +720,7 @@
713720
9A149C6820336601002135DC /* Branch+Validator.m in Sources */,
714721
5FED519B236B9E12008ECAFD /* NSError+Branch.m in Sources */,
715722
5FB6D3DE23219C46006C5094 /* BNCThreads.m in Sources */,
723+
5F32D7C8242D323C000DE539 /* BNCCallbackMap.m in Sources */,
716724
4D78C9661F2679F000EEDD5F /* BNCCrashlyticsWrapper.m in Sources */,
717725
2BD7C3E61F27CF68003696AF /* NSString+Branch.m in Sources */,
718726
5F9071C5233D5FD5003AACAD /* BranchLastAttributedTouchData.m in Sources */,

0 commit comments

Comments
 (0)