From 91be337a62ff0aab3412aa87f086e55bbd943711 Mon Sep 17 00:00:00 2001 From: Nipun Date: Fri, 4 Feb 2022 16:29:44 -0800 Subject: [PATCH] 1.41.0 Release --- Branch-SDK/BNCAppGroupsData.h | 10 +- Branch-SDK/BNCApplication.h | 20 ++-- Branch-SDK/BNCCommerceEvent.h | 18 ++-- Branch-SDK/BNCConfig.m | 2 +- .../BNCDeepLinkViewControllerInstance.h | 2 +- Branch-SDK/BNCDeviceSystem.h | 4 +- Branch-SDK/BNCEncodingUtils.h | 4 +- Branch-SDK/BNCLinkData.m | 12 +-- Branch-SDK/BNCNetworkService.h | 16 +-- Branch-SDK/BNCNetworkServiceProtocol.h | 16 +-- Branch-SDK/BNCPreferenceHelper.h | 54 +++++----- Branch-SDK/BNCSKAdNetwork.m | 2 +- Branch-SDK/BNCServerInterface.m | 4 +- Branch-SDK/BNCServerRequestQueue.m | 6 +- Branch-SDK/BNCSpotlightService.m | 2 +- Branch-SDK/BNCURLFilter.h | 4 +- Branch-SDK/BNCURLFilter.m | 12 +-- Branch-SDK/Branch.h | 1 + Branch-SDK/Branch.m | 2 +- Branch-SDK/BranchActivityItemProvider.m | 10 +- .../BranchCSSearchableItemAttributeSet.h | 2 +- Branch-SDK/BranchContentDiscoverer.m | 2 +- Branch-SDK/BranchContentDiscoveryManifest.h | 10 +- Branch-SDK/BranchContentDiscoveryManifest.m | 2 +- Branch-SDK/BranchContentPathProperties.h | 2 +- Branch-SDK/BranchEvent.h | 24 ++--- Branch-SDK/BranchEvent.m | 2 +- Branch-SDK/BranchJsonConfig.h | 20 ++-- Branch-SDK/BranchJsonConfig.m | 6 +- Branch-SDK/BranchLastAttributedTouchData.h | 2 +- Branch-SDK/BranchLinkProperties.h | 12 +-- Branch-SDK/BranchLogoutRequest.m | 2 +- Branch-SDK/BranchOpenRequest.h | 2 +- Branch-SDK/BranchPluginSupport.h | 20 ++++ Branch-SDK/BranchPluginSupport.m | 56 +++++++++++ Branch-SDK/BranchShareLink.h | 8 +- Branch-SDK/BranchShortUrlRequest.m | 10 +- Branch-SDK/BranchShortUrlSyncRequest.m | 10 +- Branch-SDK/BranchSpotlightUrlRequest.m | 2 +- Branch-SDK/BranchUniversalObject.h | 36 +++---- Branch-SDK/BranchUserCompletedActionRequest.m | 2 +- .../BranchPluginSupportTests.m | 92 ++++++++++++++++++ .../Branch-TestBed-UITests/UITestRewards.m | 60 ------------ .../Branch-TestBed.xcodeproj/project.pbxproj | 16 +++ .../CreditHistoryViewController.h | 11 --- .../CreditHistoryViewController.m | 90 ----------------- Branch-TestBed/Framework-Info.plist | Bin 938 -> 568 bytes Branch-TestBed/Gemfile | 3 - Branch-TestBed/Podfile.lock | 2 +- Branch-TestBed/fastlane/Appfile | 6 -- Branch-TestBed/fastlane/Fastfile | 28 ------ Branch-TestBed/fastlane/Matchfile | 14 --- Branch.podspec | 2 +- ChangeLog.md | 3 + README.md | 25 +---- .../BranchSDK.xcodeproj/project.pbxproj | 52 ++++++---- carthage-files/checksum | 2 - carthage-files/checksum.txt | 2 + carthage-files/checksum_noidfa | 2 - carthage-files/checksum_noidfa.txt | 2 + carthage-files/checksum_static | 2 - carthage-files/checksum_static.txt | 2 + carthage-files/checksum_static_noidfa | 2 - carthage-files/checksum_static_noidfa.txt | 2 + 64 files changed, 412 insertions(+), 441 deletions(-) create mode 100644 Branch-SDK/BranchPluginSupport.h create mode 100644 Branch-SDK/BranchPluginSupport.m create mode 100644 Branch-TestBed/Branch-SDK-Tests/BranchPluginSupportTests.m delete mode 100644 Branch-TestBed/Branch-TestBed-UITests/UITestRewards.m delete mode 100644 Branch-TestBed/Branch-TestBed/CreditHistoryViewController.h delete mode 100644 Branch-TestBed/Branch-TestBed/CreditHistoryViewController.m delete mode 100644 Branch-TestBed/Gemfile delete mode 100644 Branch-TestBed/fastlane/Appfile delete mode 100644 Branch-TestBed/fastlane/Fastfile delete mode 100644 Branch-TestBed/fastlane/Matchfile delete mode 100644 carthage-files/checksum create mode 100644 carthage-files/checksum.txt delete mode 100644 carthage-files/checksum_noidfa create mode 100644 carthage-files/checksum_noidfa.txt delete mode 100644 carthage-files/checksum_static create mode 100644 carthage-files/checksum_static.txt delete mode 100644 carthage-files/checksum_static_noidfa create mode 100644 carthage-files/checksum_static_noidfa.txt diff --git a/Branch-SDK/BNCAppGroupsData.h b/Branch-SDK/BNCAppGroupsData.h index a79c6f7..7626a2d 100644 --- a/Branch-SDK/BNCAppGroupsData.h +++ b/Branch-SDK/BNCAppGroupsData.h @@ -13,14 +13,14 @@ NS_ASSUME_NONNULL_BEGIN @interface BNCAppGroupsData : NSObject // app group used to share data between the App Clip and the Full App -@property (nonatomic, strong, readwrite) NSString *appGroup; +@property (nonatomic, readwrite, copy) NSString *appGroup; // App Clip data -@property (nonatomic, strong, readwrite) NSString *bundleID; +@property (nonatomic, readwrite, copy) NSString *bundleID; @property (nonatomic, strong, readwrite) NSDate *installDate; -@property (nonatomic, strong, readwrite) NSString *url; -@property (nonatomic, strong, readwrite) NSString *branchToken; -@property (nonatomic, strong, readwrite) NSString *bundleToken; +@property (nonatomic, readwrite, copy) NSString *url; +@property (nonatomic, readwrite, copy) NSString *branchToken; +@property (nonatomic, readwrite, copy) NSString *bundleToken; + (instancetype)shared; diff --git a/Branch-SDK/BNCApplication.h b/Branch-SDK/BNCApplication.h index ed35460..fcea5f9 100644 --- a/Branch-SDK/BNCApplication.h +++ b/Branch-SDK/BNCApplication.h @@ -22,33 +22,33 @@ + (BNCApplication*_Nonnull) currentApplication; /// The bundle identifier of the current -@property (atomic, readonly) NSString*_Nullable bundleID; +@property (nonatomic, readonly, copy) NSString*_Nullable bundleID; /// The bundle display name from the info plist. -@property (atomic, readonly) NSString*_Nullable displayName; +@property (nonatomic, readonly, copy) NSString*_Nullable displayName; /// The bundle short display name from the info plist. -@property (atomic, readonly) NSString*_Nullable shortDisplayName; +@property (nonatomic, readonly, copy) NSString*_Nullable shortDisplayName; /// The short version ID as is typically shown to the user, like in iTunes or the app store. -@property (atomic, readonly) NSString*_Nullable displayVersionString; +@property (nonatomic, readonly, copy) NSString*_Nullable displayVersionString; /// The version ID for developers use. -@property (atomic, readonly) NSString*_Nullable versionString; +@property (nonatomic, readonly, copy) NSString*_Nullable versionString; /// The creation date of the current executable. -@property (atomic, readonly) NSDate*_Nullable currentBuildDate; +@property (nonatomic, readonly, strong) NSDate*_Nullable currentBuildDate; /// The creating date of the exectuble the first time it was recorded by Branch. -@property (atomic, readonly) NSDate*_Nullable firstInstallBuildDate; +@property (nonatomic, readonly, strong) NSDate*_Nullable firstInstallBuildDate; /// The date this app was installed on this device. -@property (atomic, readonly) NSDate*_Nullable currentInstallDate; +@property (nonatomic, readonly, strong) NSDate*_Nullable currentInstallDate; /// The date this app was first installed on this device. -@property (atomic, readonly) NSDate*_Nullable firstInstallDate; +@property (nonatomic, readonly, strong) NSDate*_Nullable firstInstallDate; /// The team identifier for the app. -@property (atomic, readonly) NSString*_Nullable teamID; +@property (nonatomic, readonly, copy) NSString*_Nullable teamID; @end diff --git a/Branch-SDK/BNCCommerceEvent.h b/Branch-SDK/BNCCommerceEvent.h index e69bd41..43aaaf7 100644 --- a/Branch-SDK/BNCCommerceEvent.h +++ b/Branch-SDK/BNCCommerceEvent.h @@ -239,13 +239,13 @@ NSArray*_Nonnull BNCCurrencyAllCurrencies(void); #pragma mark - BNCProduct @interface BNCProduct : NSObject -@property (nonatomic, strong) NSString*_Nullable sku; -@property (nonatomic, strong) NSString*_Nullable name; +@property (nonatomic, copy) NSString*_Nullable sku; +@property (nonatomic, copy) NSString*_Nullable name; @property (nonatomic, strong) NSDecimalNumber*_Nullable price; @property (nonatomic, strong) NSNumber*_Nullable quantity; -@property (nonatomic, strong) NSString*_Nullable brand; -@property (nonatomic, strong) BNCProductCategory _Nullable category; -@property (nonatomic, strong) NSString*_Nullable variant; +@property (nonatomic, copy) NSString*_Nullable brand; +@property (nonatomic, copy) BNCProductCategory _Nullable category; +@property (nonatomic, copy) NSString*_Nullable variant; @end #pragma mark - BNCCommerceEvent @@ -253,12 +253,12 @@ NSArray*_Nonnull BNCCurrencyAllCurrencies(void); //__attribute__((deprecated(("Please use BranchEvent to track commerce events.")))) @interface BNCCommerceEvent : NSObject @property (nonatomic, strong) NSDecimalNumber*_Nullable revenue; -@property (nonatomic, strong) BNCCurrency _Nullable currency; -@property (nonatomic, strong) NSString*_Nullable transactionID; +@property (nonatomic, copy) BNCCurrency _Nullable currency; +@property (nonatomic, copy) NSString*_Nullable transactionID; @property (nonatomic, strong) NSDecimalNumber*_Nullable shipping; @property (nonatomic, strong) NSDecimalNumber*_Nullable tax; -@property (nonatomic, strong) NSString*_Nullable coupon; -@property (nonatomic, strong) NSString*_Nullable affiliation; +@property (nonatomic, copy) NSString*_Nullable coupon; +@property (nonatomic, copy) NSString*_Nullable affiliation; @property (nonatomic, strong) NSArray*_Nullable products; @end diff --git a/Branch-SDK/BNCConfig.m b/Branch-SDK/BNCConfig.m index 29ded2b..a002ebc 100644 --- a/Branch-SDK/BNCConfig.m +++ b/Branch-SDK/BNCConfig.m @@ -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 = @"1.40.2"; +NSString * const BNC_SDK_VERSION = @"1.41.0"; diff --git a/Branch-SDK/BNCDeepLinkViewControllerInstance.h b/Branch-SDK/BNCDeepLinkViewControllerInstance.h index d0e82af..80faab8 100644 --- a/Branch-SDK/BNCDeepLinkViewControllerInstance.h +++ b/Branch-SDK/BNCDeepLinkViewControllerInstance.h @@ -10,5 +10,5 @@ @interface BNCDeepLinkViewControllerInstance : NSObject @property (strong, nonatomic)UIViewController* viewController; -@property (assign)BNCViewControllerPresentationOption option; +@property (nonatomic, assign)BNCViewControllerPresentationOption option; @end diff --git a/Branch-SDK/BNCDeviceSystem.h b/Branch-SDK/BNCDeviceSystem.h index 4de50a2..8b1258b 100644 --- a/Branch-SDK/BNCDeviceSystem.h +++ b/Branch-SDK/BNCDeviceSystem.h @@ -23,8 +23,8 @@ NS_ASSUME_NONNULL_BEGIN // CPU type information // See mach/machine.h for details -@property (nonatomic, copy, readwrite) NSNumber *cpuType; -@property (nonatomic, copy, readwrite) NSNumber *cpuSubType; +@property (nonatomic, strong, readwrite) NSNumber *cpuType; +@property (nonatomic, strong, readwrite) NSNumber *cpuSubType; @end diff --git a/Branch-SDK/BNCEncodingUtils.h b/Branch-SDK/BNCEncodingUtils.h index 6208d5f..037f43c 100644 --- a/Branch-SDK/BNCEncodingUtils.h +++ b/Branch-SDK/BNCEncodingUtils.h @@ -28,8 +28,8 @@ extern NSString* BNCWireFormatFromString(NSString *string); + (BNCKeyValue*) key:(NSString*)key value:(NSString*)value; - (NSString*) description; -@property (nonatomic, strong) NSString* key; -@property (nonatomic, strong) NSString* value; +@property (nonatomic, copy) NSString* key; +@property (nonatomic, copy) NSString* value; @end diff --git a/Branch-SDK/BNCLinkData.m b/Branch-SDK/BNCLinkData.m index bb1af3f..2d839bf 100644 --- a/Branch-SDK/BNCLinkData.m +++ b/Branch-SDK/BNCLinkData.m @@ -14,13 +14,13 @@ @interface BNCLinkData () @property (strong, nonatomic) NSArray *tags; -@property (strong, nonatomic) NSString *alias; -@property (strong, nonatomic) NSString *channel; -@property (strong, nonatomic) NSString *feature; -@property (strong, nonatomic) NSString *stage; -@property (strong, nonatomic) NSString *campaign; +@property (copy, nonatomic) NSString *alias; +@property (copy, nonatomic) NSString *channel; +@property (copy, nonatomic) NSString *feature; +@property (copy, nonatomic) NSString *stage; +@property (copy, nonatomic) NSString *campaign; @property (strong, nonatomic) NSDictionary *params; -@property (strong, nonatomic) NSString *ignoreUAString; +@property (copy, nonatomic) NSString *ignoreUAString; @property (assign, nonatomic) BranchLinkType type; @property (assign, nonatomic) NSUInteger duration; @end diff --git a/Branch-SDK/BNCNetworkService.h b/Branch-SDK/BNCNetworkService.h index 3994b5f..eab68d2 100644 --- a/Branch-SDK/BNCNetworkService.h +++ b/Branch-SDK/BNCNetworkService.h @@ -18,13 +18,13 @@ #pragma mark BNCNetworkOperation @interface BNCNetworkOperation : NSObject -@property (readonly, copy) NSURLRequest *request; -@property (readonly, copy) NSHTTPURLResponse *response; -@property (readonly, strong) NSData *responseData; -@property (readonly, copy) NSError *error; -@property (readonly, copy) NSDate *startDate; -@property (readonly, copy) NSDate *timeoutDate; -@property (strong) NSDictionary *userInfo; +@property (nonatomic, readonly, copy) NSURLRequest *request; +@property (nonatomic, readonly, copy) NSHTTPURLResponse *response; +@property (nonatomic, readonly, strong) NSData *responseData; +@property (nonatomic, readonly, copy) NSError *error; +@property (nonatomic, readonly, copy) NSDate *startDate; +@property (nonatomic, readonly, copy) NSDate *timeoutDate; +@property (nonatomic, strong) NSDictionary *userInfo; - (void) start; - (void) cancel; @@ -40,5 +40,5 @@ - (BNCNetworkOperation*) networkOperationWithURLRequest:(NSMutableURLRequest*)request completion:(void (^)(idoperation))completion; -@property (strong) NSDictionary *userInfo; +@property (strong, nonatomic) NSDictionary *userInfo; @end diff --git a/Branch-SDK/BNCNetworkServiceProtocol.h b/Branch-SDK/BNCNetworkServiceProtocol.h index 46e57ef..96cc134 100644 --- a/Branch-SDK/BNCNetworkServiceProtocol.h +++ b/Branch-SDK/BNCNetworkServiceProtocol.h @@ -46,34 +46,34 @@ /// The initial NSMutableURLRequest. @required -@property (readonly, copy) NSURLRequest *request; +@property (nonatomic, readonly, copy) NSURLRequest *request; /// The response from the server. @required -@property (readonly, copy) NSHTTPURLResponse *response; +@property (nonatomic, readonly, copy) NSHTTPURLResponse *response; /// The data from the server. @required -@property (readonly, strong) NSData *responseData; +@property (nonatomic, readonly, strong) NSData *responseData; /// Any errors that occurred during the request. @required -@property (readonly, copy) NSError *error; +@property (nonatomic, readonly, copy) NSError *error; /// The original start date of the operation. This should be set by the network service provider /// when the operation is started. @required -@property (readonly, copy) NSDate *startDate; +@property (nonatomic, readonly, copy) NSDate *startDate; /// The timeout date for the operation. This is calculated and set by the underlying network service /// provider by taking the original start date and adding the timeout interval of the URL request. /// It should be set once (and not recalculated for each retry) by the network service. @required -@property (readonly, copy) NSDate *timeoutDate; +@property (nonatomic, readonly, copy) NSDate *timeoutDate; /// A dictionary for the Branch SDK to store operation user info. @required -@property (strong) NSDictionary *userInfo; +@property (nonatomic, strong) NSDictionary *userInfo; /// Starts the network operation. @required @@ -109,7 +109,7 @@ /// A dictionary for the Branch SDK to store operation user info. @required -@property (strong) NSDictionary *userInfo; +@property (nonatomic, strong) NSDictionary *userInfo; /// Pins the session to the array of public keys. @optional diff --git a/Branch-SDK/BNCPreferenceHelper.h b/Branch-SDK/BNCPreferenceHelper.h index 7166d7d..39be77a 100644 --- a/Branch-SDK/BNCPreferenceHelper.h +++ b/Branch-SDK/BNCPreferenceHelper.h @@ -19,22 +19,22 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void); @interface BNCPreferenceHelper : NSObject -@property (strong, nonatomic) NSString *lastRunBranchKey; +@property (copy, nonatomic) NSString *lastRunBranchKey; @property (strong, nonatomic) NSDate *lastStrongMatchDate; -@property (strong, nonatomic) NSString *appVersion; - -@property (strong, nonatomic) NSString *randomizedDeviceToken; -@property (strong, nonatomic) NSString *randomizedBundleToken; - -@property (strong, nonatomic) NSString *sessionID; -@property (strong, nonatomic) NSString *linkClickIdentifier; -@property (strong, nonatomic) NSString *spotlightIdentifier; -@property (strong, atomic) NSString *universalLinkUrl; -@property (strong, atomic) NSString *initialReferrer; -@property (strong, nonatomic) NSString *userUrl; -@property (strong, nonatomic) NSString *userIdentity; -@property (strong, nonatomic) NSString *sessionParams; -@property (strong, nonatomic) NSString *installParams; +@property (copy, nonatomic) NSString *appVersion; + +@property (copy, nonatomic) NSString *randomizedDeviceToken; +@property (copy, nonatomic) NSString *randomizedBundleToken; + +@property (copy, nonatomic) NSString *sessionID; +@property (copy, nonatomic) NSString *linkClickIdentifier; +@property (copy, nonatomic) NSString *spotlightIdentifier; +@property (copy, nonatomic) NSString *universalLinkUrl; +@property (copy, nonatomic) NSString *initialReferrer; +@property (copy, nonatomic) NSString *userUrl; +@property (copy, nonatomic) NSString *userIdentity; +@property (copy, nonatomic) NSString *sessionParams; +@property (copy, nonatomic) NSString *installParams; @property (assign, nonatomic) BOOL isDebug; @property (assign, nonatomic) BOOL checkedFacebookAppLinks; @property (assign, nonatomic) BOOL checkedAppleSearchAdAttribution; @@ -44,28 +44,28 @@ NSURL* /* _Nonnull */ BNCURLForBranchDirectory(void); @property (assign, nonatomic) NSInteger retryCount; @property (assign, nonatomic) NSTimeInterval retryInterval; @property (assign, nonatomic) NSTimeInterval timeout; -@property (strong, atomic) NSString *externalIntentURI; +@property (copy, nonatomic) NSString *externalIntentURI; @property (strong, nonatomic) NSMutableDictionary *savedAnalyticsData; @property (strong, nonatomic) NSDictionary *appleSearchAdDetails; @property (assign, nonatomic) BOOL appleSearchAdNeedsSend; -@property (strong, nonatomic) NSString *lastSystemBuildVersion; -@property (strong, nonatomic) NSString *browserUserAgentString; -@property (strong, atomic) NSString *referringURL; -@property (strong, atomic) NSString *branchAPIURL; -@property (assign, atomic) BOOL limitFacebookTracking; -@property (strong, atomic) NSDate *previousAppBuildDate; +@property (copy, nonatomic) NSString *lastSystemBuildVersion; +@property (copy, nonatomic) NSString *browserUserAgentString; +@property (copy, nonatomic) NSString *referringURL; +@property (copy, nonatomic) NSString *branchAPIURL; +@property (assign, nonatomic) BOOL limitFacebookTracking; +@property (strong, nonatomic) NSDate *previousAppBuildDate; @property (assign, nonatomic, readwrite) BOOL disableAdNetworkCallouts; @property (strong, nonatomic, readwrite) NSURL *faceBookAppLink; -@property (nonatomic, strong, readwrite) NSString *patternListURL; -@property (strong, atomic) NSArray *savedURLPatternList; -@property (assign, atomic) NSInteger savedURLPatternListVersion; -@property (assign, atomic) BOOL dropURLOpen; +@property (nonatomic, copy, readwrite) NSString *patternListURL; +@property (strong, nonatomic) NSArray *savedURLPatternList; +@property (assign, nonatomic) NSInteger savedURLPatternListVersion; +@property (assign, nonatomic) BOOL dropURLOpen; @property (assign, nonatomic) BOOL sendCloseRequests; -@property (assign, atomic) BOOL trackingDisabled; +@property (assign, nonatomic) BOOL trackingDisabled; - (void) clearTrackingInformation; + (BNCPreferenceHelper *)sharedInstance; diff --git a/Branch-SDK/BNCSKAdNetwork.m b/Branch-SDK/BNCSKAdNetwork.m index 6a00303..6de04c0 100644 --- a/Branch-SDK/BNCSKAdNetwork.m +++ b/Branch-SDK/BNCSKAdNetwork.m @@ -11,7 +11,7 @@ @interface BNCSKAdNetwork() -@property (nonatomic, copy, readwrite) NSDate *installDate; +@property (nonatomic, strong, readwrite) NSDate *installDate; @property (nonatomic, strong, readwrite) Class skAdNetworkClass; @property (nonatomic, assign, readwrite) SEL skAdNetworkRegisterAppForAdNetworkAttribution; diff --git a/Branch-SDK/BNCServerInterface.m b/Branch-SDK/BNCServerInterface.m index 0ec24e0..af5a21b 100644 --- a/Branch-SDK/BNCServerInterface.m +++ b/Branch-SDK/BNCServerInterface.m @@ -19,8 +19,8 @@ #import "BNCApplication.h" @interface BNCServerInterface () -@property (strong) NSString *requestEndpoint; -@property (strong) id networkService; +@property (copy, nonatomic) NSString *requestEndpoint; +@property (strong, nonatomic) id networkService; @end @implementation BNCServerInterface diff --git a/Branch-SDK/BNCServerRequestQueue.m b/Branch-SDK/BNCServerRequestQueue.m index 5763f91..94b0715 100755 --- a/Branch-SDK/BNCServerRequestQueue.m +++ b/Branch-SDK/BNCServerRequestQueue.m @@ -33,9 +33,9 @@ static inline uint64_t BNCNanoSecondsFromTimeInterval(NSTimeInterval interval) { @interface BNCServerRequestQueue() -@property (strong) NSMutableArray *queue; -@property (strong) dispatch_queue_t asyncQueue; -@property (strong) dispatch_source_t persistTimer; +@property (strong, nonatomic) NSMutableArray *queue; +@property (strong, nonatomic) dispatch_queue_t asyncQueue; +@property (strong, nonatomic) dispatch_source_t persistTimer; @end diff --git a/Branch-SDK/BNCSpotlightService.m b/Branch-SDK/BNCSpotlightService.m index 8c0d485..e59096e 100644 --- a/Branch-SDK/BNCSpotlightService.m +++ b/Branch-SDK/BNCSpotlightService.m @@ -33,7 +33,7 @@ @interface BNCSpotlightService() { dispatch_queue_t _workQueue; } @property (strong, nonatomic) NSMutableDictionary *userInfo; -@property (strong, readonly) dispatch_queue_t workQueue; +@property (strong, readonly, nonatomic) dispatch_queue_t workQueue; @end #pragma mark - BNCSpotlightService diff --git a/Branch-SDK/BNCURLFilter.h b/Branch-SDK/BNCURLFilter.h index 25572f2..17850ea 100644 --- a/Branch-SDK/BNCURLFilter.h +++ b/Branch-SDK/BNCURLFilter.h @@ -36,6 +36,6 @@ - (void) updatePatternListWithCompletion:(void (^_Nullable) (NSError*_Nullable error, NSArray*_Nullable list))completion; /// Is YES if the listed has already been updated from the server. -@property (assign, readonly) BOOL hasUpdatedPatternList; -@property (strong) NSArray*_Nullable patternList; +@property (assign, readonly, nonatomic) BOOL hasUpdatedPatternList; +@property (strong, nonatomic) NSArray*_Nullable patternList; @end diff --git a/Branch-SDK/BNCURLFilter.m b/Branch-SDK/BNCURLFilter.m index 1d76f33..f591d0e 100644 --- a/Branch-SDK/BNCURLFilter.m +++ b/Branch-SDK/BNCURLFilter.m @@ -14,12 +14,12 @@ @interface BNCURLFilter () { NSArray*_patternList; } -@property (strong) NSArray *ignoredURLRegex; -@property (assign) NSInteger listVersion; -@property (strong) id networkService; -@property (assign) BOOL hasUpdatedPatternList; -@property (strong) NSError *error; -@property (strong) NSURL *jsonURL; +@property (strong, nonatomic) NSArray *ignoredURLRegex; +@property (assign, nonatomic) NSInteger listVersion; +@property (strong, nonatomic) id networkService; +@property (assign, nonatomic) BOOL hasUpdatedPatternList; +@property (strong, nonatomic) NSError *error; +@property (strong, nonatomic) NSURL *jsonURL; @end @implementation BNCURLFilter diff --git a/Branch-SDK/Branch.h b/Branch-SDK/Branch.h index fb947db..75b8399 100644 --- a/Branch-SDK/Branch.h +++ b/Branch-SDK/Branch.h @@ -33,6 +33,7 @@ #import "BNCInitSessionResponse.h" #import "UIViewController+Branch.h" #import "BranchScene.h" +#import "BranchPluginSupport.h" #if !TARGET_OS_TV // tvOS does not support these features diff --git a/Branch-SDK/Branch.m b/Branch-SDK/Branch.m index 3f86f8b..8f5b588 100644 --- a/Branch-SDK/Branch.m +++ b/Branch-SDK/Branch.m @@ -131,7 +131,7 @@ @interface Branch() { @property (strong, nonatomic) BNCServerInterface *serverInterface; @property (strong, nonatomic) BNCServerRequestQueue *requestQueue; @property (strong, nonatomic) dispatch_semaphore_t processing_sema; -@property (assign, atomic) NSInteger networkCount; +@property (assign, nonatomic) NSInteger networkCount; @property (assign, nonatomic) BNCInitStatus initializationStatus; @property (assign, nonatomic) BOOL shouldAutomaticallyDeepLink; @property (strong, nonatomic) BNCLinkCache *linkCache; diff --git a/Branch-SDK/BranchActivityItemProvider.m b/Branch-SDK/BranchActivityItemProvider.m index 97e595d..0f45d7e 100644 --- a/Branch-SDK/BranchActivityItemProvider.m +++ b/Branch-SDK/BranchActivityItemProvider.m @@ -19,11 +19,11 @@ @interface BranchActivityItemProvider () @property (strong, nonatomic) NSDictionary *params; @property (strong, nonatomic) NSArray *tags; -@property (strong, nonatomic) NSString *feature; -@property (strong, nonatomic) NSString *stage; -@property (strong, nonatomic) NSString *campaign; -@property (strong, nonatomic) NSString *alias; -@property (strong, nonatomic) NSString *userAgentString; +@property (copy, nonatomic) NSString *feature; +@property (copy, nonatomic) NSString *stage; +@property (copy, nonatomic) NSString *campaign; +@property (copy, nonatomic) NSString *alias; +@property (copy, nonatomic) NSString *userAgentString; @property (weak, nonatomic) id delegate; @end diff --git a/Branch-SDK/BranchCSSearchableItemAttributeSet.h b/Branch-SDK/BranchCSSearchableItemAttributeSet.h index bbe2161..ca536c3 100644 --- a/Branch-SDK/BranchCSSearchableItemAttributeSet.h +++ b/Branch-SDK/BranchCSSearchableItemAttributeSet.h @@ -36,7 +36,7 @@ NS_ASSUME_NONNULL_BEGIN @property (nonatomic, strong, nullable) NSDictionary *params; @property (nonatomic, strong, nullable) NSSet *keywords; -@property (nonatomic) BOOL publiclyIndexable; //!< Defaults to YES +@property (nonatomic, assign) BOOL publiclyIndexable; //!< Defaults to YES @end diff --git a/Branch-SDK/BranchContentDiscoverer.m b/Branch-SDK/BranchContentDiscoverer.m index d50b834..b8ab1da 100644 --- a/Branch-SDK/BranchContentDiscoverer.m +++ b/Branch-SDK/BranchContentDiscoverer.m @@ -19,7 +19,7 @@ @interface BranchContentDiscoverer () @property (nonatomic, strong) NSString *lastViewControllerName; @property (nonatomic, strong) NSTimer *contentDiscoveryTimer; -@property (nonatomic) NSInteger numOfViewsDiscovered; +@property (nonatomic, assign) NSInteger numOfViewsDiscovered; @end diff --git a/Branch-SDK/BranchContentDiscoveryManifest.h b/Branch-SDK/BranchContentDiscoveryManifest.h index 1019e1d..4f5d54c 100644 --- a/Branch-SDK/BranchContentDiscoveryManifest.h +++ b/Branch-SDK/BranchContentDiscoveryManifest.h @@ -11,11 +11,11 @@ @interface BranchContentDiscoveryManifest : NSObject @property (strong, nonatomic) NSMutableDictionary *cdManifest; -@property (strong, nonatomic) NSString *referredLink; -@property (nonatomic) NSInteger maxTextLen; -@property (nonatomic) NSInteger maxViewHistoryLength; -@property (nonatomic) NSInteger maxPktSize; -@property (nonatomic) BOOL isCDEnabled; +@property (nonatomic, copy) NSString *referredLink; +@property (nonatomic, assign) NSInteger maxTextLen; +@property (nonatomic, assign) NSInteger maxViewHistoryLength; +@property (nonatomic, assign) NSInteger maxPktSize; +@property (nonatomic, assign) BOOL isCDEnabled; @property (strong, nonatomic) NSMutableArray *contentPaths; + (BranchContentDiscoveryManifest *)getInstance; diff --git a/Branch-SDK/BranchContentDiscoveryManifest.m b/Branch-SDK/BranchContentDiscoveryManifest.m index 22d8f85..e105859 100644 --- a/Branch-SDK/BranchContentDiscoveryManifest.m +++ b/Branch-SDK/BranchContentDiscoveryManifest.m @@ -14,7 +14,7 @@ @interface BranchContentDiscoveryManifest () -@property (nonatomic, strong) NSString *manifestVersion; +@property (nonatomic, copy) NSString *manifestVersion; @end diff --git a/Branch-SDK/BranchContentPathProperties.h b/Branch-SDK/BranchContentPathProperties.h index 045cbcb..fa87bfc 100644 --- a/Branch-SDK/BranchContentPathProperties.h +++ b/Branch-SDK/BranchContentPathProperties.h @@ -17,7 +17,7 @@ @interface BranchContentPathProperties : NSObject @property (strong, nonatomic) NSDictionary *pathInfo; -@property (nonatomic) BOOL isClearText; +@property (assign, nonatomic) BOOL isClearText; - (instancetype)init:(NSDictionary *)pathInfo; - (NSArray *)getFilteredElements; diff --git a/Branch-SDK/BranchEvent.h b/Branch-SDK/BranchEvent.h index 0c8bce1..f3b7d6e 100644 --- a/Branch-SDK/BranchEvent.h +++ b/Branch-SDK/BranchEvent.h @@ -73,22 +73,22 @@ typedef NS_ENUM(NSInteger, BranchEventAdType) { - (instancetype _Nonnull) init __attribute((unavailable)); + (instancetype _Nonnull) new __attribute((unavailable)); -@property (nonatomic, strong) NSString*_Nullable alias; -@property (nonatomic, strong) NSString*_Nullable transactionID; -@property (nonatomic, strong) BNCCurrency _Nullable currency; +@property (nonatomic, copy) NSString*_Nullable alias; +@property (nonatomic, copy) NSString*_Nullable transactionID; +@property (nonatomic, copy) BNCCurrency _Nullable currency; @property (nonatomic, strong) NSDecimalNumber*_Nullable revenue; @property (nonatomic, strong) NSDecimalNumber*_Nullable shipping; @property (nonatomic, strong) NSDecimalNumber*_Nullable tax; -@property (nonatomic, strong) NSString*_Nullable coupon; -@property (nonatomic, strong) NSString*_Nullable affiliation; -@property (nonatomic, strong) NSString*_Nullable eventDescription; -@property (nonatomic, strong) NSString*_Nullable searchQuery; +@property (nonatomic, copy) NSString*_Nullable coupon; +@property (nonatomic, copy) NSString*_Nullable affiliation; +@property (nonatomic, copy) NSString*_Nullable eventDescription; +@property (nonatomic, copy) NSString*_Nullable searchQuery; @property (nonatomic, assign) BranchEventAdType adType; -@property (nonatomic, copy) NSArray*_Nonnull contentItems; -@property (nonatomic, copy) NSDictionary *_Nonnull customData; +@property (nonatomic, strong) NSArray*_Nonnull contentItems; +@property (nonatomic, strong) NSDictionary *_Nonnull customData; /** Logs the event on the Branch server. @@ -122,7 +122,7 @@ typedef NS_ENUM(NSInteger, BranchEventAdType) { eventDictionary:(NSDictionary*_Nullable)eventDictionary completion:(void (^_Nullable)(NSDictionary*_Nullable response, NSError*_Nullable error))completion; -@property (strong) NSDictionary*_Nullable eventDictionary; -@property (strong) NSURL*_Nullable serverURL; -@property (copy) void (^_Nullable completion)(NSDictionary*_Nullable response, NSError*_Nullable error); +@property (nonatomic, strong) NSDictionary*_Nullable eventDictionary; +@property (nonatomic, strong) NSURL*_Nullable serverURL; +@property (nonatomic, copy) void (^_Nullable completion)(NSDictionary*_Nullable response, NSError*_Nullable error); @end diff --git a/Branch-SDK/BranchEvent.m b/Branch-SDK/BranchEvent.m index 05f1152..3736e62 100644 --- a/Branch-SDK/BranchEvent.m +++ b/Branch-SDK/BranchEvent.m @@ -115,7 +115,7 @@ + (BOOL)supportsSecureCoding { #pragma mark - BranchEvent @interface BranchEvent () -@property (nonatomic, strong) NSString* eventName; +@property (nonatomic, copy) NSString* eventName; @end @implementation BranchEvent : NSObject diff --git a/Branch-SDK/BranchJsonConfig.h b/Branch-SDK/BranchJsonConfig.h index 1dd9cdc..bf01cf8 100644 --- a/Branch-SDK/BranchJsonConfig.h +++ b/Branch-SDK/BranchJsonConfig.h @@ -23,16 +23,16 @@ extern NSString * _Nonnull const BranchJsonConfigCheckPasteboardOnInstall; @property (class, readonly, nonnull) BranchJsonConfig *instance; @property (nonatomic, readonly, nullable) NSURL *configFileURL; -@property (nonatomic, readonly) BOOL debugMode; -@property (nonatomic, readonly, nullable) NSString *branchKey; -@property (nonatomic, readonly, nullable) NSString *liveKey; -@property (nonatomic, readonly, nullable) NSString *testKey; -@property (nonatomic, readonly) BOOL useTestInstance; -@property (nonatomic, readonly) BOOL delayInitToCheckForSearchAds; -@property (nonatomic, readonly) BOOL appleSearchAdsDebugMode; -@property (nonatomic, readonly) BOOL deferInitializationForJSLoad; -@property (nonatomic, readonly) BOOL enableFacebookLinkCheck; -@property (nonatomic, readonly) BOOL checkPasteboardOnInstall; +@property (nonatomic, readonly, assign) BOOL debugMode; +@property (nonatomic, readonly, nullable, copy) NSString *branchKey; +@property (nonatomic, readonly, nullable, copy) NSString *liveKey; +@property (nonatomic, readonly, nullable, copy) NSString *testKey; +@property (nonatomic, readonly, assign) BOOL useTestInstance; +@property (nonatomic, readonly, assign) BOOL delayInitToCheckForSearchAds; +@property (nonatomic, readonly, assign) BOOL appleSearchAdsDebugMode; +@property (nonatomic, readonly, assign) BOOL deferInitializationForJSLoad; +@property (nonatomic, readonly, assign) BOOL enableFacebookLinkCheck; +@property (nonatomic, readonly, assign) BOOL checkPasteboardOnInstall; - (nullable id)objectForKey:(NSString * _Nonnull)key; - (nullable id)objectForKeyedSubscript:(NSString * _Nonnull)key; diff --git a/Branch-SDK/BranchJsonConfig.m b/Branch-SDK/BranchJsonConfig.m index f5e6a67..43a1a90 100644 --- a/Branch-SDK/BranchJsonConfig.m +++ b/Branch-SDK/BranchJsonConfig.m @@ -21,9 +21,9 @@ NSString * _Nonnull const BranchJsonConfigCheckPasteboardOnInstall = @"checkPasteboardOnInstall"; @interface BranchJsonConfig() -@property (nonatomic) NSDictionary *configuration; -@property (nonatomic, readonly) NSData *configFileContents; -@property (nonatomic) NSURL *configFileURL; +@property (nonatomic, strong) NSDictionary *configuration; +@property (nonatomic, readonly, strong) NSData *configFileContents; +@property (nonatomic, strong) NSURL *configFileURL; @end @implementation BranchJsonConfig diff --git a/Branch-SDK/BranchLastAttributedTouchData.h b/Branch-SDK/BranchLastAttributedTouchData.h index d7cf1b9..66842b9 100644 --- a/Branch-SDK/BranchLastAttributedTouchData.h +++ b/Branch-SDK/BranchLastAttributedTouchData.h @@ -16,7 +16,7 @@ NS_ASSUME_NONNULL_BEGIN // free-form JSON @property (nonatomic, strong, readonly) NSDictionary *lastAttributedTouchJSON; -@property (nonatomic, copy, readonly) NSNumber *attributionWindow; +@property (nonatomic, strong, readonly) NSNumber *attributionWindow; + (nullable BranchLastAttributedTouchData *)buildFromJSON:(NSDictionary *)json; diff --git a/Branch-SDK/BranchLinkProperties.h b/Branch-SDK/BranchLinkProperties.h index 28aa6d6..b18a978 100644 --- a/Branch-SDK/BranchLinkProperties.h +++ b/Branch-SDK/BranchLinkProperties.h @@ -15,12 +15,12 @@ @interface BranchLinkProperties : NSObject @property (nonatomic, strong) NSArray *tags; -@property (nonatomic, strong) NSString *feature; -@property (nonatomic, strong) NSString *alias; -@property (nonatomic, strong) NSString *channel; -@property (nonatomic, strong) NSString *stage; -@property (nonatomic, strong) NSString *campaign; -@property (nonatomic) NSUInteger matchDuration; +@property (nonatomic, copy) NSString *feature; +@property (nonatomic, copy) NSString *alias; +@property (nonatomic, copy) NSString *channel; +@property (nonatomic, copy) NSString *stage; +@property (nonatomic, copy) NSString *campaign; +@property (nonatomic, assign) NSUInteger matchDuration; @property (nonatomic, strong) NSDictionary *controlParams; - (void)addControlParam:(NSString *)controlParam withValue:(NSString *)value; diff --git a/Branch-SDK/BranchLogoutRequest.m b/Branch-SDK/BranchLogoutRequest.m index eee21d4..9095d96 100644 --- a/Branch-SDK/BranchLogoutRequest.m +++ b/Branch-SDK/BranchLogoutRequest.m @@ -13,7 +13,7 @@ #import "BNCEncodingUtils.h" @interface BranchLogoutRequest () -@property (copy) callbackWithStatus callback; +@property (nonatomic, copy) callbackWithStatus callback; @end diff --git a/Branch-SDK/BranchOpenRequest.h b/Branch-SDK/BranchOpenRequest.h index fb988ff..e656c3d 100644 --- a/Branch-SDK/BranchOpenRequest.h +++ b/Branch-SDK/BranchOpenRequest.h @@ -11,7 +11,7 @@ @interface BranchOpenRequest : BNCServerRequest -@property (copy) callbackWithStatus callback; +@property (nonatomic, copy) callbackWithStatus callback; + (void) waitForOpenResponseLock; + (void) releaseOpenResponseLock; diff --git a/Branch-SDK/BranchPluginSupport.h b/Branch-SDK/BranchPluginSupport.h new file mode 100644 index 0000000..a13e7fe --- /dev/null +++ b/Branch-SDK/BranchPluginSupport.h @@ -0,0 +1,20 @@ +// +// BranchPluginSupport.h +// BranchSDK +// +// Created by Nipun Singh on 1/6/22. +// Copyright © 2022 Branch, Inc. All rights reserved. +// + +#import + +NS_ASSUME_NONNULL_BEGIN + +@interface BranchPluginSupport : NSObject + ++ (BranchPluginSupport *)instance; +- (NSDictionary *)deviceDescription; + +@end + +NS_ASSUME_NONNULL_END diff --git a/Branch-SDK/BranchPluginSupport.m b/Branch-SDK/BranchPluginSupport.m new file mode 100644 index 0000000..6dd9d4b --- /dev/null +++ b/Branch-SDK/BranchPluginSupport.m @@ -0,0 +1,56 @@ +// +// BranchPluginSupport.m +// BranchSDK +// +// Created by Nipun Singh on 1/6/22. +// Copyright © 2022 Branch, Inc. All rights reserved. +// + +#import "BranchPluginSupport.h" +#import "NSMutableDictionary+Branch.h" +#import "BNCDeviceInfo.h" +#import "BNCPreferenceHelper.h" + +@interface BranchPluginSupport() + +@end + +@implementation BranchPluginSupport + ++ (BranchPluginSupport *)instance { + static BranchPluginSupport *pluginSupport; + static dispatch_once_t onceToken; + dispatch_once(&onceToken, ^{ + pluginSupport = [BranchPluginSupport new]; + }); + return pluginSupport; +} + + +- (NSDictionary *)deviceDescription { + BNCDeviceInfo *deviceInfo = [BNCDeviceInfo getInstance]; + [deviceInfo checkAdvertisingIdentifier]; + + NSMutableDictionary *dictionary = [NSMutableDictionary new]; + + [dictionary bnc_safeSetObject:deviceInfo.osName forKey:@"os"]; + [dictionary bnc_safeSetObject:deviceInfo.osVersion forKey:@"os_version"]; + [dictionary bnc_safeSetObject:deviceInfo.environment forKey:@"environment"]; + [dictionary bnc_safeSetObject:deviceInfo.vendorId forKey:@"idfv"]; + [dictionary bnc_safeSetObject:deviceInfo.advertiserId forKey:@"idfa"]; + [dictionary bnc_safeSetObject:deviceInfo.optedInStatus forKey:@"opted_in_status"]; + [dictionary bnc_safeSetObject:[BNCPreferenceHelper sharedInstance].userIdentity forKey:@"developer_identity"]; + [dictionary bnc_safeSetObject:deviceInfo.country forKey:@"country"]; + [dictionary bnc_safeSetObject:deviceInfo.language forKey:@"language"]; + [dictionary bnc_safeSetObject:deviceInfo.localIPAddress forKey:@"local_ip"]; + [dictionary bnc_safeSetObject:deviceInfo.brandName forKey:@"brand"]; + [dictionary bnc_safeSetObject:deviceInfo.applicationVersion forKey:@"app_version"]; + [dictionary bnc_safeSetObject:deviceInfo.modelName forKey:@"model"]; + [dictionary bnc_safeSetObject:deviceInfo.screenScale forKey:@"screen_dpi"]; + [dictionary bnc_safeSetObject:deviceInfo.screenHeight forKey:@"screen_height"]; + [dictionary bnc_safeSetObject:deviceInfo.screenWidth forKey:@"screen_width"]; + + return dictionary; +} + +@end diff --git a/Branch-SDK/BranchShareLink.h b/Branch-SDK/BranchShareLink.h index 977259e..02efc6b 100644 --- a/Branch-SDK/BranchShareLink.h +++ b/Branch-SDK/BranchShareLink.h @@ -85,7 +85,7 @@ Presents a UIActivityViewController that shares the Branch link. anchor:(id _Nullable)anchorViewOrButtonItem; ///The title for the share sheet. -@property (nonatomic, strong) NSString*_Nullable title; +@property (nonatomic, copy) NSString*_Nullable title; // Override the default placeholder URL // iOS 13+ fetches a preview header icon, text and domain name from this URL. @@ -97,7 +97,7 @@ Presents a UIActivityViewController that shares the Branch link. ///Share text for the item. This is not the text in the iOS 13+ preview header. ///This text can be changed later when the `branchShareSheetWillShare:` delegate method is called. -@property (nonatomic, strong) NSString*_Nullable shareText; +@property (nonatomic, copy) NSString*_Nullable shareText; ///An additional, user defined, non-typed, object to be shared. ///This object can be changed later when the `branchShareSheetWillShare:` delegate method is called. @@ -105,13 +105,13 @@ Presents a UIActivityViewController that shares the Branch link. ///Sets an email subject line for the share activity. If the Branch link property already has an ///email subject, that attribute takes precedence over this field. -@property (nonatomic, strong) NSString*_Nullable emailSubject; +@property (nonatomic, copy) NSString*_Nullable emailSubject; ///The resulting Branch URL that was shared. @property (nonatomic, strong, readonly) NSURL*_Nullable shareURL; ///The activity type that the user chose. -@property (nonatomic, strong, readonly) NSString*_Nullable activityType; +@property (nonatomic, readonly, copy) NSString*_Nullable activityType; ///Extra server parameters that should be included with the link data. @property (nonatomic, strong) NSMutableDictionary*_Nullable serverParameters; diff --git a/Branch-SDK/BranchShortUrlRequest.m b/Branch-SDK/BranchShortUrlRequest.m index 42e1c34..e2fa305 100644 --- a/Branch-SDK/BranchShortUrlRequest.m +++ b/Branch-SDK/BranchShortUrlRequest.m @@ -14,13 +14,13 @@ @interface BranchShortUrlRequest () @property (strong, nonatomic) NSArray *tags; -@property (strong, nonatomic) NSString *alias; +@property (copy, nonatomic) NSString *alias; @property (assign, nonatomic) BranchLinkType type; @property (assign, nonatomic) NSInteger matchDuration; -@property (strong, nonatomic) NSString *channel; -@property (strong, nonatomic) NSString *feature; -@property (strong, nonatomic) NSString *stage; -@property (strong, nonatomic) NSString *campaign; +@property (copy, nonatomic) NSString *channel; +@property (copy, nonatomic) NSString *feature; +@property (copy, nonatomic) NSString *stage; +@property (copy, nonatomic) NSString *campaign; @property (strong, nonatomic) NSDictionary *params; @property (strong, nonatomic) BNCLinkCache *linkCache; @property (strong, nonatomic) BNCLinkData *linkData; diff --git a/Branch-SDK/BranchShortUrlSyncRequest.m b/Branch-SDK/BranchShortUrlSyncRequest.m index b0f26d3..84939f4 100644 --- a/Branch-SDK/BranchShortUrlSyncRequest.m +++ b/Branch-SDK/BranchShortUrlSyncRequest.m @@ -16,13 +16,13 @@ @interface BranchShortUrlSyncRequest () @property (strong, nonatomic) NSArray *tags; -@property (strong, nonatomic) NSString *alias; +@property (copy, nonatomic) NSString *alias; @property (assign, nonatomic) BranchLinkType type; @property (assign, nonatomic) NSInteger matchDuration; -@property (strong, nonatomic) NSString *channel; -@property (strong, nonatomic) NSString *feature; -@property (strong, nonatomic) NSString *stage; -@property (strong, nonatomic) NSString *campaign; +@property (copy, nonatomic) NSString *channel; +@property (copy, nonatomic) NSString *feature; +@property (copy, nonatomic) NSString *stage; +@property (copy, nonatomic) NSString *campaign; @property (strong, nonatomic) NSDictionary *params; @property (strong, nonatomic) BNCLinkCache *linkCache; @property (strong, nonatomic) BNCLinkData *linkData; diff --git a/Branch-SDK/BranchSpotlightUrlRequest.m b/Branch-SDK/BranchSpotlightUrlRequest.m index e9437b7..abdd33f 100644 --- a/Branch-SDK/BranchSpotlightUrlRequest.m +++ b/Branch-SDK/BranchSpotlightUrlRequest.m @@ -9,7 +9,7 @@ #import "BranchSpotlightUrlRequest.h" @interface BranchSpotlightUrlRequest () -@property (strong, nonatomic) callbackWithParams spotlightCallback; +@property (copy, nonatomic) callbackWithParams spotlightCallback; @end @implementation BranchSpotlightUrlRequest diff --git a/Branch-SDK/BranchUniversalObject.h b/Branch-SDK/BranchUniversalObject.h index da26d6d..82380fc 100644 --- a/Branch-SDK/BranchUniversalObject.h +++ b/Branch-SDK/BranchUniversalObject.h @@ -70,25 +70,25 @@ FOUNDATION_EXPORT BranchCondition _Nonnull BranchConditionRefurbished; @interface BranchContentMetadata : NSObject -@property (nonatomic, strong, nullable) BranchContentSchema contentSchema; +@property (nonatomic, copy, nullable) BranchContentSchema contentSchema; @property (nonatomic, assign) double quantity; @property (nonatomic, strong, nullable) NSDecimalNumber *price; -@property (nonatomic, strong, nullable) BNCCurrency currency; -@property (nonatomic, strong, nullable) NSString *sku; -@property (nonatomic, strong, nullable) NSString *productName; -@property (nonatomic, strong, nullable) NSString *productBrand; -@property (nonatomic, strong, nullable) BNCProductCategory productCategory; -@property (nonatomic, strong, nullable) NSString *productVariant; -@property (nonatomic, strong, nullable) BranchCondition condition; +@property (nonatomic, copy, nullable) BNCCurrency currency; +@property (nonatomic, nullable, copy) NSString *sku; +@property (nonatomic, nullable, copy) NSString *productName; +@property (nonatomic, nullable, copy) NSString *productBrand; +@property (nonatomic, copy, nullable) BNCProductCategory productCategory; +@property (nonatomic, nullable, copy) NSString *productVariant; +@property (nonatomic, copy, nullable) BranchCondition condition; @property (nonatomic, assign) double ratingAverage; @property (nonatomic, assign) NSInteger ratingCount; @property (nonatomic, assign) double ratingMax; @property (nonatomic, assign) double rating; -@property (nonatomic, strong, nullable) NSString *addressStreet; -@property (nonatomic, strong, nullable) NSString *addressCity; -@property (nonatomic, strong, nullable) NSString *addressRegion; -@property (nonatomic, strong, nullable) NSString *addressCountry; -@property (nonatomic, strong, nullable) NSString *addressPostalCode; +@property (nonatomic, nullable, copy) NSString *addressStreet; +@property (nonatomic, nullable, copy) NSString *addressCity; +@property (nonatomic, nullable, copy) NSString *addressRegion; +@property (nonatomic, nullable, copy) NSString *addressCountry; +@property (nonatomic, nullable, copy) NSString *addressPostalCode; @property (nonatomic, assign) double latitude; @property (nonatomic, assign) double longitude; @property (nonatomic, copy, nonnull) NSMutableArray *imageCaptions; @@ -106,11 +106,11 @@ FOUNDATION_EXPORT BranchCondition _Nonnull BranchConditionRefurbished; - (nonnull instancetype)initWithCanonicalIdentifier:(nonnull NSString *)canonicalIdentifier; - (nonnull instancetype)initWithTitle:(nonnull NSString *)title; -@property (nonatomic, strong, nullable) NSString *canonicalIdentifier; -@property (nonatomic, strong, nullable) NSString *canonicalUrl; -@property (nonatomic, strong, nullable) NSString *title; -@property (nonatomic, strong, nullable) NSString *contentDescription; -@property (nonatomic, strong, nullable) NSString *imageUrl; +@property (nonatomic, nullable, copy) NSString *canonicalIdentifier; +@property (nonatomic, nullable, copy) NSString *canonicalUrl; +@property (nonatomic, nullable, copy) NSString *title; +@property (nonatomic, nullable, copy) NSString *contentDescription; +@property (nonatomic, nullable, copy) NSString *imageUrl; @property (nonatomic, strong, nullable) NSArray *keywords; @property (nonatomic, strong, nullable) NSDate *creationDate; @property (nonatomic, strong, nullable) NSDate *expirationDate; diff --git a/Branch-SDK/BranchUserCompletedActionRequest.m b/Branch-SDK/BranchUserCompletedActionRequest.m index 5822bea..2937f6c 100644 --- a/Branch-SDK/BranchUserCompletedActionRequest.m +++ b/Branch-SDK/BranchUserCompletedActionRequest.m @@ -14,7 +14,7 @@ @interface BranchUserCompletedActionRequest () -@property (strong, nonatomic) NSString *action; +@property (copy, nonatomic) NSString *action; @property (strong, nonatomic) NSDictionary *state; @end diff --git a/Branch-TestBed/Branch-SDK-Tests/BranchPluginSupportTests.m b/Branch-TestBed/Branch-SDK-Tests/BranchPluginSupportTests.m new file mode 100644 index 0000000..2f2507f --- /dev/null +++ b/Branch-TestBed/Branch-SDK-Tests/BranchPluginSupportTests.m @@ -0,0 +1,92 @@ +// +// BranchPluginSupportTests.m +// Branch-SDK-Tests +// +// Created by Nipun Singh on 1/25/22. +// Copyright © 2022 Branch, Inc. All rights reserved. +// + +#import +#import "BranchPluginSupport.h" + +@interface BranchPluginSupportTests : XCTestCase +@property (nonatomic, strong, readwrite) NSDictionary *deviceDescription; +@end + +@implementation BranchPluginSupportTests + +- (void)setUp { + self.deviceDescription = [[BranchPluginSupport new] deviceDescription]; +} + +- (void)tearDown { + // Put teardown code here. This method is called after the invocation of each test method in the class. +} + +- (void)testAppVersion { + // checks test app version + XCTAssert([@"1.1" isEqualToString:_deviceDescription[@"app_version"]]); +} + +- (void)testBrandName { + XCTAssert([@"Apple" isEqualToString:_deviceDescription[@"brand"]]); +} + +- (void)testModelName_Simulator { + // intel processor + bool x86_64 = [@"x86_64" isEqualToString:_deviceDescription[@"model"]]; + + // apple processor + bool arm64 = [@"arm64" isEqualToString:_deviceDescription[@"model"]]; + + XCTAssert(x86_64 || arm64); +} + + +- (void)testOSName { + XCTAssertNotNil(_deviceDescription[@"os"]); + XCTAssert([_deviceDescription[@"os"] isEqualToString:[UIDevice currentDevice].systemName]); +} + +- (void)testOSVersion { + XCTAssertNotNil(_deviceDescription[@"os_version"]); + XCTAssert([_deviceDescription[@"os_version"] isEqualToString:[UIDevice currentDevice].systemVersion]); +} + +- (void)testEnvironment { + XCTAssert([@"FULL_APP" isEqualToString:_deviceDescription[@"environment"]]); +} + +- (void)testScreenWidth { + XCTAssert(_deviceDescription[@"screen_width"].intValue > 320); +} + +- (void)testScreenHeight { + XCTAssert(_deviceDescription[@"screen_height"].intValue > 320); +} + +- (void)testScreenScale { + XCTAssert(_deviceDescription[@"screen_dpi"].intValue > 0); +} + +- (void)testCountry { + NSString *locale = [NSLocale currentLocale].localeIdentifier; + XCTAssertNotNil(locale); + XCTAssert([locale containsString:_deviceDescription[@"country"]]); +} + +- (void)testLanguage { + NSString *locale = [NSLocale currentLocale].localeIdentifier; + XCTAssertNotNil(locale); + XCTAssert([locale containsString:_deviceDescription[@"language"]]); +} + +- (void)testLocalIPAddress { + NSString *address = _deviceDescription[@"local_ip"]; + XCTAssertNotNil(address); + + // shortest ipv4 is 7 + XCTAssert(address.length >= 7); +} + +@end diff --git a/Branch-TestBed/Branch-TestBed-UITests/UITestRewards.m b/Branch-TestBed/Branch-TestBed-UITests/UITestRewards.m deleted file mode 100644 index 10d0d35..0000000 --- a/Branch-TestBed/Branch-TestBed-UITests/UITestRewards.m +++ /dev/null @@ -1,60 +0,0 @@ -// -// UITestRewards.m -// Branch-TestBed-UITests -// -// Created by Nidhi on 3/7/21. -// Copyright © 2021 Branch, Inc. All rights reserved. -// - -#import "UITestCaseTestBed.h" - -@interface UITestRewards : UITestCaseTestBed - -@end - -@implementation UITestRewards - -- (void)setUp { - [super setUp]; - [[[XCUIApplication alloc] init] launch]; - [self disableTracking:FALSE]; -} - -- (void)tearDown { -} - -- (void)testRewards { - - // Click 'Set User ID' & then 'Refresh Rewards' - XCUIApplication *app = [[XCUIApplication alloc] init]; - XCUIElementQuery *tablesQuery = app.tables; - [tablesQuery.buttons[@"Set User ID"] tap]; - [app.navigationBars[@"Branch-TestBed"].buttons[@"Branch-TestBed"] tap]; - sleep(1); - [tablesQuery.buttons[@"Refresh Rewards"] tap]; - sleep(3); - - // Check Rewards - XCUIElement *staticText = tablesQuery.staticTexts[@"rewardPoints"]; - NSInteger rewards = [staticText.label integerValue]; - XCTAssertGreaterThan(rewards, 0, "Incorrect Rewards."); - - // Click 'Redeem 5 Points' - XCUIElement *redeem5PointsStaticText = tablesQuery.staticTexts[@"Redeem 5 Points"]; - [redeem5PointsStaticText tap]; - sleep(5); - NSInteger newRewards = [staticText.label integerValue]; - - // Check Rewards again - XCTAssertTrue((rewards - newRewards) == 5); - - // Logout and Check Rewards again - [tablesQuery/*@START_MENU_TOKEN@*/.staticTexts[@"SimulateLogout"]/*[[".cells",".buttons[@\"SimulateLogout\"].staticTexts[@\"SimulateLogout\"]",".staticTexts[@\"SimulateLogout\"]"],[[[-1,2],[-1,1],[-1,0,1]],[[-1,2],[-1,1]]],[0]]@END_MENU_TOKEN@*/ tap]; - [app.alerts[@"Logout succeeded"].scrollViews.otherElements.buttons[@"OK"] tap]; - [staticText tap]; - newRewards = [staticText.value integerValue]; - XCTAssertTrue(newRewards == 0); - -} - -@end diff --git a/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj b/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj index 86a57d2..d0a1fbd 100644 --- a/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj +++ b/Branch-TestBed/Branch-TestBed.xcodeproj/project.pbxproj @@ -266,6 +266,11 @@ 7D58823A1CA1DF2700FF6358 /* BNCDeviceInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D5882391CA1DF2700FF6358 /* BNCDeviceInfo.m */; }; 9A2B7DD51FEC3BAF00CD188B /* Branch+Validator.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A2B7DD31FEC3BAE00CD188B /* Branch+Validator.h */; }; 9A2B7DD61FEC3BAF00CD188B /* Branch+Validator.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A2B7DD41FEC3BAE00CD188B /* Branch+Validator.m */; }; + C10F393A27A0872800BF5D36 /* BranchPluginSupportTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F393927A0872800BF5D36 /* BranchPluginSupportTests.m */; }; + C10F394127A08C2400BF5D36 /* BranchPluginSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = C10F393F27A08C2400BF5D36 /* BranchPluginSupport.h */; }; + C10F394227A08C2400BF5D36 /* BranchPluginSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F394027A08C2400BF5D36 /* BranchPluginSupport.m */; }; + C10F394327A08C2400BF5D36 /* BranchPluginSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F394027A08C2400BF5D36 /* BranchPluginSupport.m */; }; + C10F394427A08C2400BF5D36 /* BranchPluginSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F394027A08C2400BF5D36 /* BranchPluginSupport.m */; }; E2B9474A1D15D75000F2270D /* BNCCallbacks.h in Headers */ = {isa = PBXBuildFile; fileRef = E2B947491D15D73900F2270D /* BNCCallbacks.h */; settings = {ATTRIBUTES = (Public, ); }; }; F185BAAA1F3D30D70056300C /* BNCSpotlightService.h in Headers */ = {isa = PBXBuildFile; fileRef = F185BAA81F3D30D70056300C /* BNCSpotlightService.h */; }; F185BAAB1F3D30D70056300C /* BNCSpotlightService.m in Sources */ = {isa = PBXBuildFile; fileRef = F185BAA91F3D30D70056300C /* BNCSpotlightService.m */; }; @@ -599,6 +604,9 @@ 9A2B7DD31FEC3BAE00CD188B /* Branch+Validator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Branch+Validator.h"; sourceTree = ""; }; 9A2B7DD41FEC3BAE00CD188B /* Branch+Validator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Branch+Validator.m"; sourceTree = ""; }; BD84AC94725CA0D8C816E00F /* Pods-Branch-SDK-Tests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Branch-SDK-Tests.debug.xcconfig"; path = "Pods/Target Support Files/Pods-Branch-SDK-Tests/Pods-Branch-SDK-Tests.debug.xcconfig"; sourceTree = ""; }; + C10F393927A0872800BF5D36 /* BranchPluginSupportTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BranchPluginSupportTests.m; sourceTree = ""; }; + C10F393F27A08C2400BF5D36 /* BranchPluginSupport.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchPluginSupport.h; sourceTree = ""; }; + C10F394027A08C2400BF5D36 /* BranchPluginSupport.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchPluginSupport.m; sourceTree = ""; }; D258D2C41A794D64004A1C90 /* BranchActivityItemProvider.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchActivityItemProvider.h; sourceTree = ""; }; D258D2C51A794D64004A1C90 /* BranchActivityItemProvider.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchActivityItemProvider.m; sourceTree = ""; }; E2B947491D15D73900F2270D /* BNCCallbacks.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BNCCallbacks.h; sourceTree = ""; }; @@ -683,6 +691,7 @@ 4D16837A2098C901008819E3 /* Branch-SDK-Tests */ = { isa = PBXGroup; children = ( + C10F393927A0872800BF5D36 /* BranchPluginSupportTests.m */, 5FD1786D26DEE49C009696E3 /* BNCPasteboardTests.m */, 5F92B23B2384744A00CA909B /* BNCLocaleTests.m */, 5F92B23323835FEB00CA909B /* BNCReachabilityTests.m */, @@ -883,6 +892,8 @@ 670016BB1946309100A9E103 /* Branch-SDK */ = { isa = PBXGroup; children = ( + C10F393F27A08C2400BF5D36 /* BranchPluginSupport.h */, + C10F394027A08C2400BF5D36 /* BranchPluginSupport.m */, 5F38020224DCC2E600E6FAFD /* BNCNetworkService.h */, 5F3801F924DCC2E500E6FAFD /* BNCNetworkService.m */, 5F3801FA24DCC2E500E6FAFD /* BNCNetworkServiceProtocol.h */, @@ -1116,6 +1127,7 @@ 5F3D6715232C589100454FF1 /* BranchLastAttributedTouchData.h in Headers */, 5F38020E24DCC2E800E6FAFD /* BranchContentPathProperties.h in Headers */, 5F92B23F238486E200CA909B /* BNCNetworkInterface.h in Headers */, + C10F394127A08C2400BF5D36 /* BranchPluginSupport.h in Headers */, 4DCAC8301F426F7C00405D1D /* NSMutableDictionary+Branch.h in Headers */, 4DCAC8311F426F7C00405D1D /* NSString+Branch.h in Headers */, 5F38021E24DCC2E800E6FAFD /* BranchCPIDRequest.h in Headers */, @@ -1445,6 +1457,7 @@ 466B58681B17779C00A69EDE /* BNCLinkData.m in Sources */, 5F437E36237DDF770052064B /* BNCTelephony.m in Sources */, 5F892ED8236258390023AEC1 /* BNCFacebookAppLinks.m in Sources */, + C10F394227A08C2400BF5D36 /* BranchPluginSupport.m in Sources */, 54FF1F921BD1DC320004CE2E /* BranchLinkProperties.m in Sources */, 466B586A1B17779C00A69EDE /* BNCLinkCache.m in Sources */, 4D7881F7209CF28F002B750F /* BNCThreads.m in Sources */, @@ -1483,6 +1496,7 @@ 4DBEFFF61FB114F900F7C41B /* ArrayPickerView.m in Sources */, 4683F0761B20A73F00A432E7 /* AppDelegate.m in Sources */, 670016701940F51400A9E103 /* main.m in Sources */, + C10F394327A08C2400BF5D36 /* BranchPluginSupport.m in Sources */, 63E4C48B1D25E17B00A45FD8 /* NavigationController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1505,6 +1519,7 @@ 4D1683B22098C902008819E3 /* BNCKeyChain.Test.m in Sources */, 5F92B242238752A500CA909B /* BNCDeviceInfoTests.m in Sources */, 4D1683C62098C902008819E3 /* BranchEvent.Test.m in Sources */, + C10F393A27A0872800BF5D36 /* BranchPluginSupportTests.m in Sources */, 5F83B9ED2433BAAA0054A022 /* BNCServerInterface.Test.m in Sources */, 5F205D0823186AF700C776D1 /* BNCUserAgentCollectorTests.m in Sources */, 4D1683C12098C902008819E3 /* BNCApplication.Test.m in Sources */, @@ -1517,6 +1532,7 @@ 5F892ECE23624E0A0023AEC1 /* BNCFacebookAppLinksTests.m in Sources */, 5FE694382405FA2700E3AEE2 /* BNCCallbackMapTests.m in Sources */, 5FDB04F424E6156800F2F267 /* BNCSKAdNetworkTests.m in Sources */, + C10F394427A08C2400BF5D36 /* BranchPluginSupport.m in Sources */, 4D1683BB2098C902008819E3 /* BranchShortUrlRequestTests.m in Sources */, 5FB6CC13264F0C7C0020E478 /* BNCServerRequestQueueTests.m in Sources */, 4D1683BA2098C902008819E3 /* BNCLog.Test.m in Sources */, diff --git a/Branch-TestBed/Branch-TestBed/CreditHistoryViewController.h b/Branch-TestBed/Branch-TestBed/CreditHistoryViewController.h deleted file mode 100644 index e7989ea..0000000 --- a/Branch-TestBed/Branch-TestBed/CreditHistoryViewController.h +++ /dev/null @@ -1,11 +0,0 @@ -// -// CreditHistoryViewController.h -// Branch-TestBed -// -// Created by Qinwei Gong on 10/9/14. -// Copyright (c) 2014 Branch Metrics. All rights reserved. -// - -@interface CreditHistoryViewController : UITableViewController -@property (nonatomic, strong) NSArray *creditTransactions; -@end diff --git a/Branch-TestBed/Branch-TestBed/CreditHistoryViewController.m b/Branch-TestBed/Branch-TestBed/CreditHistoryViewController.m deleted file mode 100644 index d495a54..0000000 --- a/Branch-TestBed/Branch-TestBed/CreditHistoryViewController.m +++ /dev/null @@ -1,90 +0,0 @@ -// -// CreditHistoryViewController.m -// Branch-TestBed -// -// Created by Qinwei Gong on 10/9/14. -// Copyright (c) 2014 Branch Metrics. All rights reserved. -// - -#import "CreditHistoryViewController.h" - -@interface CreditHistoryViewController () -@end - -@implementation CreditHistoryViewController - -- (void)viewDidLoad { - [super viewDidLoad]; -} - -- (void)viewWillAppear:(BOOL)animated { - self.navigationController.navigationBarHidden = NO; - [super viewWillAppear:animated]; -} - -#pragma mark - Table view data source - -- (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView { - return 1; -} - -- (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger)section { - return self.creditTransactions.count > 0 ? self.creditTransactions.count : 1; -} - -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { - UITableViewCell *cell = [tableView dequeueReusableCellWithIdentifier:@"CreditTransactionRow" forIndexPath:indexPath]; - - if (!cell) { - cell = [[UITableViewCell alloc] initWithStyle:UITableViewCellStyleSubtitle reuseIdentifier:@"CreditTransactionRow"]; - } - - if (self.creditTransactions.count > 0) { - - if ([self.creditTransactions count] > 0) { - NSDictionary *creditItem = [[self creditTransactions] objectAtIndex:indexPath.row]; - NSDictionary *transaction = [creditItem objectForKey:@"transaction"]; - int amount = (int) [[transaction objectForKey:@"amount"] integerValue]; - NSString *bucket = [transaction objectForKey:@"bucket"]; - - NSString *amountAsString; - if (amount >= 0) { - amountAsString = [NSString stringWithFormat:@"+%d", amount]; - } else { - amountAsString = [NSString stringWithFormat:@"%d", amount]; - } - NSString *text = [NSString stringWithFormat:@"%@ to %@", amountAsString, bucket]; - - if ([transaction objectForKey:@"referrer"]) { - text = [NSString stringWithFormat:@"%@ - Referred by: %@", text, [transaction objectForKey:@"referrer"]]; - } if ([transaction objectForKey:@"referred"]) { - text = [NSString stringWithFormat:@"%@ - User Referred: %@", text, [transaction objectForKey:@"referred"]]; - } - [cell textLabel].text = text; - - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - [dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ss.SSSZ"]; - [dateFormatter setLocale:[NSLocale currentLocale]]; - NSString *dateString = transaction[@"date"]; - NSDate *date = [dateFormatter dateFromString:dateString]; - if (date) { - [dateFormatter setDateStyle:NSDateFormatterMediumStyle]; - [dateFormatter setTimeStyle:NSDateFormatterMediumStyle]; - [cell detailTextLabel].text = [dateFormatter stringFromDate:date]; - } - - if (date) - [cell detailTextLabel].text = [dateFormatter stringFromDate:date]; - } - - - } else { - cell.textLabel.text = @"None found"; - cell.detailTextLabel.text = nil; - } - - return cell; -} - - -@end diff --git a/Branch-TestBed/Framework-Info.plist b/Branch-TestBed/Framework-Info.plist index da523f3c7d1441b1b1f7456d85d4b692da8d1e23..ea4fd1587a361142062aaf639655c91651a7e32b 100644 GIT binary patch literal 568 zcmYk2Sx&<+5QfL>TOlor5CSP&Ahd|(5z&@H#VS(D3sU4JCb62@!Eu1Rz&W@85_jMt zNE`vq0MjK1TlS3q|Fg$-D++n6i^WeeG(0joHa;;qH9eEd&CVIQd||$@u;>``m0CFw zUdXCEjzXHA(GGKrLZ%)(GB?q*6{5J9iHA(r#jUip;==z2*F7dQzvWCh###n<$trg> zmx8La$yAKlP3HE?{axaMx^3#SMjBzgl?<{2sq|oHRy6--a$iuLDBLiYX#*Coc4A+$ zyM!wi*DnGo*tzW(%V+jc(xKv#QLp>5ii}dl{XjR%iV8PyjMYZK%>KgU=eB8AkIkCG zpLvj~?HGA3tyT}UVy|s+8QVKnu~9p{K5mw*trF&Y*e0d14Hb|OK?({u_z-{w6W(xa zLJ>-^i&+^x3IbeoO*jRHOqX^c1`Cya2(g?0PKbLehCV~}9%m2930TMTPB2g51zzDD jKHwXE$O73QJLHOR(jkhZynTXOxBruw#i7$=S)DE^on@{35=F7%?A_`fM zU2^Yv`1r){ua^b9qBcUwp4TNE4^U=`3pww359zpl<@JM>e;&?;>ECz+Wg(1(_+c=K zhTyd+y(!BADGk#Q;z^XG;5aB9O+D~(Ys+g&SF06an=O*5tHw@RFW4M3R4!Wp0XwSbTe>sW3{s#3^bEj?$iD232?N= ztg`H>_$KZb+DJaDWUFy1ndS&PSrD@XlJFMB+F4sEy=XELag&M+Kp0fQUohJPE(~DWQU~^3C@>6`{yFa&0LP@T)-TV7G!7lmH zAs3B!F_+9%`jcqiJx!p7Jib<%B=`7I35_O-b0u+>9CNg~LVD=mH2GaEnY>5FHys+P zvesgr+vE1Wb;kkxdxMKk_wvw>J9G`o41t@XfGyO3Q$_uXoV*{!r@Pksbo);Pt^euG BIadGx diff --git a/Branch-TestBed/Gemfile b/Branch-TestBed/Gemfile deleted file mode 100644 index 7a118b4..0000000 --- a/Branch-TestBed/Gemfile +++ /dev/null @@ -1,3 +0,0 @@ -source "https://rubygems.org" - -gem "fastlane" diff --git a/Branch-TestBed/Podfile.lock b/Branch-TestBed/Podfile.lock index d5fed7d..661dee8 100644 --- a/Branch-TestBed/Podfile.lock +++ b/Branch-TestBed/Podfile.lock @@ -29,4 +29,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 829cf437db3e2065c6c17ddea2f24b51cb0aecc0 -COCOAPODS: 1.10.1 +COCOAPODS: 1.10.2 diff --git a/Branch-TestBed/fastlane/Appfile b/Branch-TestBed/fastlane/Appfile deleted file mode 100644 index 1803063..0000000 --- a/Branch-TestBed/fastlane/Appfile +++ /dev/null @@ -1,6 +0,0 @@ -# app_identifier("[[APP_IDENTIFIER]]") # The bundle identifier of your app -# apple_id("[[APPLE_ID]]") # Your Apple email address - - -# For more information about the Appfile, see: -# https://docs.fastlane.tools/advanced/#appfile diff --git a/Branch-TestBed/fastlane/Fastfile b/Branch-TestBed/fastlane/Fastfile deleted file mode 100644 index fbde4c6..0000000 --- a/Branch-TestBed/fastlane/Fastfile +++ /dev/null @@ -1,28 +0,0 @@ -# This file contains the fastlane.tools configuration -# You can find the documentation at https://docs.fastlane.tools -# -# For a list of all available actions, check out -# -# https://docs.fastlane.tools/actions -# -# For a list of all available plugins, check out -# -# https://docs.fastlane.tools/plugins/available-plugins -# - -# Uncomment the line if you want fastlane to automatically update itself -# update_fastlane - -default_platform(:ios) - -platform :ios do - - before_all do - setup_circle_ci - end - - desc "Install signing certificates" - lane :test do - match(type: "development", readonly: is_cli) - end -end diff --git a/Branch-TestBed/fastlane/Matchfile b/Branch-TestBed/fastlane/Matchfile deleted file mode 100644 index e8fc363..0000000 --- a/Branch-TestBed/fastlane/Matchfile +++ /dev/null @@ -1,14 +0,0 @@ -# branch private repo for fastlane match -git_url("git@github.com:BranchMetrics/ios-signing-certificates.git") - -storage_mode("git") - -type("development") # The default type, can be: appstore, adhoc, enterprise or development - -app_identifier(["io.branch.sdk.Branch-TestBed"]) -username("sdk-team@branch.io") - -# For all available options run `fastlane match --help` -# Remove the # in the beginning of the line to enable the other options - -# The docs are available on https://docs.fastlane.tools/actions/match diff --git a/Branch.podspec b/Branch.podspec index 02f9e86..91fc288 100644 --- a/Branch.podspec +++ b/Branch.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "Branch" - s.version = "1.40.2" + s.version = "1.41.0" 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? diff --git a/ChangeLog.md b/ChangeLog.md index 4209b0e..68fc073 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,5 +1,8 @@ Branch iOS SDK Change Log +v.1.41.0 +- SDK-1189 Added API for plugin support + v.1.40.2 - CORE-2502 Fix serialization issue diff --git a/README.md b/README.md index c0845e8..b57cb7d 100644 --- a/README.md +++ b/README.md @@ -1,24 +1,3 @@ -# Swift Package Manager repository for iOS -[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FBranchMetrics%2Fios-branch-sdk-spm%2Fbadge%3Ftype%3Dswift-versions)](https://swiftpackageindex.com/BranchMetrics/ios-branch-sdk-spm) -[![](https://img.shields.io/endpoint?url=https%3A%2F%2Fswiftpackageindex.com%2Fapi%2Fpackages%2FBranchMetrics%2Fios-branch-sdk-spm%2Fbadge%3Ftype%3Dplatforms)](https://swiftpackageindex.com/BranchMetrics/ios-branch-sdk-spm) -![GitHub release (latest by date)](https://img.shields.io/github/v/release/BranchMetrics/ios-branch-sdk-spm) -![GitHub Release Date](https://img.shields.io/github/release-date/BranchMetrics/ios-branch-sdk-spm) -[![Unit tests](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/actions/workflows/verify.yml/badge.svg)](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/actions/workflows/verify.yml) +## Branch SDK Documentation for iOS -This is a mirror of the main [Branch Metrics iOS SDK repository](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution) -for use only with Swift Package Manager. It removes binaries and all commit -history before release [0.35.0](https://github.com/BranchMetrics/ios-branch-deep-linking-attribution/releases/0.35.0), -the first release to support SPM. This greatly improves performance when using -SPM. Releases to the main repo are automatically replicated here with each -tag. - -This is for use only with Swift Package Manager. Please use the main repo for -any other purpose. - -**Note:** This repo was previously `BranchMetrics/ios-spm`. The old URL will -still work due to redirection. Please use -`https://github.com/BranchMetrics/ios-branch-sdk-spm` when installing in new -projects and update the old URL when convenient. - -See https://help.branch.io/developers-hub/docs/ios-sdk-overview for full -documentation of the Branch iOS SDK. +View [Branch's SDK documentation for iOS](https://help.branch.io/developers-hub/docs/ios-sdk-overview) diff --git a/carthage-files/BranchSDK.xcodeproj/project.pbxproj b/carthage-files/BranchSDK.xcodeproj/project.pbxproj index 5d4661a..802f5cf 100644 --- a/carthage-files/BranchSDK.xcodeproj/project.pbxproj +++ b/carthage-files/BranchSDK.xcodeproj/project.pbxproj @@ -465,6 +465,12 @@ 7DA3BF221D889CE500CA8AE0 /* BranchContentPathProperties.m in Sources */ = {isa = PBXBuildFile; fileRef = 7DA3BF1C1D889CE500CA8AE0 /* BranchContentPathProperties.m */; }; 9A149C6720336601002135DC /* Branch+Validator.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A149C6520336600002135DC /* Branch+Validator.h */; }; 9A149C6820336601002135DC /* Branch+Validator.m in Sources */ = {isa = PBXBuildFile; fileRef = 9A149C6620336600002135DC /* Branch+Validator.m */; }; + C10F39232787B52800BF5D36 /* BranchPluginSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = C10F39212787B52800BF5D36 /* BranchPluginSupport.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C10F39242787B52800BF5D36 /* BranchPluginSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = C10F39212787B52800BF5D36 /* BranchPluginSupport.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C10F39252787B52800BF5D36 /* BranchPluginSupport.h in Headers */ = {isa = PBXBuildFile; fileRef = C10F39212787B52800BF5D36 /* BranchPluginSupport.h */; settings = {ATTRIBUTES = (Public, ); }; }; + C10F39262787B52800BF5D36 /* BranchPluginSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F39222787B52800BF5D36 /* BranchPluginSupport.m */; }; + C10F39272787B52800BF5D36 /* BranchPluginSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F39222787B52800BF5D36 /* BranchPluginSupport.m */; }; + C10F39282787B52800BF5D36 /* BranchPluginSupport.m in Sources */ = {isa = PBXBuildFile; fileRef = C10F39222787B52800BF5D36 /* BranchPluginSupport.m */; }; E230A16C1D03DB9E006181D8 /* BNCConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = E230A1151D03DB9E006181D8 /* BNCConfig.h */; settings = {ATTRIBUTES = (Public, ); }; }; E230A16D1D03DB9E006181D8 /* BNCContentDiscoveryManager.h in Headers */ = {isa = PBXBuildFile; fileRef = E230A1161D03DB9E006181D8 /* BNCContentDiscoveryManager.h */; }; E230A16E1D03DB9E006181D8 /* BNCContentDiscoveryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = E230A1171D03DB9E006181D8 /* BNCContentDiscoveryManager.m */; }; @@ -624,6 +630,8 @@ 7DA3BF1C1D889CE500CA8AE0 /* BranchContentPathProperties.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchContentPathProperties.m; sourceTree = ""; }; 9A149C6520336600002135DC /* Branch+Validator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Branch+Validator.h"; sourceTree = ""; }; 9A149C6620336600002135DC /* Branch+Validator.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "Branch+Validator.m"; sourceTree = ""; }; + C10F39212787B52800BF5D36 /* BranchPluginSupport.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = BranchPluginSupport.h; sourceTree = ""; }; + C10F39222787B52800BF5D36 /* BranchPluginSupport.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = BranchPluginSupport.m; sourceTree = ""; }; E230A1151D03DB9E006181D8 /* BNCConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCConfig.h; sourceTree = ""; }; E230A1161D03DB9E006181D8 /* BNCContentDiscoveryManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCContentDiscoveryManager.h; sourceTree = ""; }; E230A1171D03DB9E006181D8 /* BNCContentDiscoveryManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCContentDiscoveryManager.m; sourceTree = ""; }; @@ -827,6 +835,8 @@ E230A12D1D03DB9E006181D8 /* BNCSystemObserver.m */, E230A12F1D03DB9E006181D8 /* Branch.h */, E230A1301D03DB9E006181D8 /* Branch.m */, + C10F39212787B52800BF5D36 /* BranchPluginSupport.h */, + C10F39222787B52800BF5D36 /* BranchPluginSupport.m */, 9A149C6520336600002135DC /* Branch+Validator.h */, 9A149C6620336600002135DC /* Branch+Validator.m */, E230A1311D03DB9E006181D8 /* BranchActivityItemProvider.h */, @@ -902,6 +912,7 @@ 5FC4D068248614840001E701 /* BNCApplication.h in Headers */, 5F3802CA24DCE83200E6FAFD /* BranchRegisterViewRequest.h in Headers */, 5FB38C992523D9E900E9A85A /* BNCAppGroupsData.h in Headers */, + C10F39242787B52800BF5D36 /* BranchPluginSupport.h in Headers */, 5FC4D08C248614850001E701 /* BNCSystemObserver.h in Headers */, 5F3802B224DCE7FD00E6FAFD /* BranchInstallRequest.h in Headers */, 5FC4D056248614830001E701 /* BNCFacebookAppLinks.h in Headers */, @@ -1038,6 +1049,7 @@ 5FD0FA8425CE46BD008200EE /* BNCFieldDefines.h in Headers */, 5FD0FA8525CE46BD008200EE /* BranchLogoutRequest.h in Headers */, 5FD0FA8625CE46BD008200EE /* BNCTelephony.h in Headers */, + C10F39252787B52800BF5D36 /* BranchPluginSupport.h in Headers */, 5FD0FA8725CE46BD008200EE /* BNCAppleReceipt.h in Headers */, 5FD0FA8825CE46BD008200EE /* NSMutableDictionary+Branch.h in Headers */, 5FD0FA8925CE46BD008200EE /* BranchShortUrlRequest.h in Headers */, @@ -1094,6 +1106,7 @@ 4D778E1E218253F200308B51 /* BranchCSSearchableItemAttributeSet.h in Headers */, 4DAF63BA1F86C26A006316E9 /* BranchDelegate.h in Headers */, 4DB328061FA10C6300ACF9B0 /* BranchEvent.h in Headers */, + C10F39232787B52800BF5D36 /* BranchPluginSupport.h in Headers */, 5F38028324DCE73100E6FAFD /* BranchUserCompletedActionRequest.h in Headers */, 5FD5EBE9243FB95000961CAF /* BNCInitSessionResponse.h in Headers */, E230A1921D03DB9E006181D8 /* BranchUniversalObject.h in Headers */, @@ -1386,6 +1399,7 @@ 5F3802B824DCE81200E6FAFD /* BranchLATDRequest.m in Sources */, 5FC4D057248614830001E701 /* BNCFacebookAppLinks.m in Sources */, 5F85110625B11E1000D544A1 /* BNCURLFilter.m in Sources */, + C10F39272787B52800BF5D36 /* BranchPluginSupport.m in Sources */, 5FC4D01A2486145F0001E701 /* UIViewController+Branch.m in Sources */, 5F3802DC24DCE90400E6FAFD /* BranchSpotlightUrlRequest.m in Sources */, 5F38029C24DCE7CB00E6FAFD /* BNCServerInterface.m in Sources */, @@ -1485,6 +1499,7 @@ 5FD0FACB25CE46BD008200EE /* BNCCrashlyticsWrapper.m in Sources */, 5FD0FACC25CE46BD008200EE /* NSString+Branch.m in Sources */, 5FD0FACD25CE46BD008200EE /* BranchLastAttributedTouchData.m in Sources */, + C10F39282787B52800BF5D36 /* BranchPluginSupport.m in Sources */, 5FD0FACE25CE46BD008200EE /* BNCAppGroupsData.m in Sources */, 5FD0FACF25CE46BD008200EE /* BNCPreferenceHelper.m in Sources */, 5FD0FAD025CE46BD008200EE /* BNCConfig.m in Sources */, @@ -1566,6 +1581,7 @@ 4D78C9661F2679F000EEDD5F /* BNCCrashlyticsWrapper.m in Sources */, 2BD7C3E61F27CF68003696AF /* NSString+Branch.m in Sources */, 5F9071C5233D5FD5003AACAD /* BranchLastAttributedTouchData.m in Sources */, + C10F39262787B52800BF5D36 /* BranchPluginSupport.m in Sources */, 5FB38C9A2523D9E900E9A85A /* BNCAppGroupsData.m in Sources */, E230A17A1D03DB9E006181D8 /* BNCPreferenceHelper.m in Sources */, 4D3FA94D1DFF3F6C00E2B6A9 /* BNCConfig.m in Sources */, @@ -1656,13 +1672,13 @@ DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 2; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Branch-tvOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.40.2; + MARKETING_VERSION = 1.41.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -1692,13 +1708,13 @@ DEFINES_MODULE = YES; DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 2; DYLIB_INSTALL_NAME_BASE = "@rpath"; GCC_C_LANGUAGE_STANDARD = gnu11; INFOPLIST_FILE = "Branch-tvOS/Info.plist"; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MARKETING_VERSION = 1.40.2; + MARKETING_VERSION = 1.41.0; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = NO; PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch; @@ -1718,10 +1734,10 @@ APPLICATION_EXTENSION_API_ONLY = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 2; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Branch/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1730,7 +1746,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.40.2; + MARKETING_VERSION = 1.41.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch; @@ -1747,10 +1763,10 @@ APPLICATION_EXTENSION_API_ONLY = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 2; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Branch/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1759,7 +1775,7 @@ LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACH_O_TYPE = staticlib; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.40.2; + MARKETING_VERSION = 1.41.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch; @@ -1819,7 +1835,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1877,7 +1893,7 @@ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -1904,17 +1920,17 @@ APPLICATION_EXTENSION_API_ONLY = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 2; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Branch/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.40.2; + MARKETING_VERSION = 1.41.0; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch; @@ -1931,17 +1947,17 @@ APPLICATION_EXTENSION_API_ONLY = YES; BUILD_LIBRARY_FOR_DISTRIBUTION = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = ""; - CURRENT_PROJECT_VERSION = 1; + CURRENT_PROJECT_VERSION = 2; DEFINES_MODULE = YES; DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; + DYLIB_CURRENT_VERSION = 2; DYLIB_INSTALL_NAME_BASE = "@rpath"; INFOPLIST_FILE = Branch/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 9.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.40.2; + MARKETING_VERSION = 1.41.0; ONLY_ACTIVE_ARCH = NO; OTHER_LDFLAGS = "-ObjC"; PRODUCT_BUNDLE_IDENTIFIER = io.branch.Branch; diff --git a/carthage-files/checksum b/carthage-files/checksum deleted file mode 100644 index 9f3a043..0000000 --- a/carthage-files/checksum +++ /dev/null @@ -1,2 +0,0 @@ -#checksum for Branch.zip on Github -4653a56d03e4502cd3e8c287ae34ceca20ffef3c Branch.zip diff --git a/carthage-files/checksum.txt b/carthage-files/checksum.txt new file mode 100644 index 0000000..08df03c --- /dev/null +++ b/carthage-files/checksum.txt @@ -0,0 +1,2 @@ +#checksum for Branch on Github +3b04dcd05e46e2023f233296e80f10de7e1b996f Branch.zip diff --git a/carthage-files/checksum_noidfa b/carthage-files/checksum_noidfa deleted file mode 100644 index 6ec383e..0000000 --- a/carthage-files/checksum_noidfa +++ /dev/null @@ -1,2 +0,0 @@ -#checksum for Branch on Github -472054c29f4d4284ef01954a59cee54a90c9f0a2 Branch_noidfa.zip diff --git a/carthage-files/checksum_noidfa.txt b/carthage-files/checksum_noidfa.txt new file mode 100644 index 0000000..eef6efe --- /dev/null +++ b/carthage-files/checksum_noidfa.txt @@ -0,0 +1,2 @@ +#checksum for Branch on Github +7f1679579b151be18113f40a3b8341db3dc83a59 Branch_noidfa.zip diff --git a/carthage-files/checksum_static b/carthage-files/checksum_static deleted file mode 100644 index 9e91568..0000000 --- a/carthage-files/checksum_static +++ /dev/null @@ -1,2 +0,0 @@ -#checksum for Branch-static.zip on Github -c6371b163f28a37acf214507f70d0d2e162a597a Branch_static.zip diff --git a/carthage-files/checksum_static.txt b/carthage-files/checksum_static.txt new file mode 100644 index 0000000..242ffa4 --- /dev/null +++ b/carthage-files/checksum_static.txt @@ -0,0 +1,2 @@ +#checksum for Branch on Github +6345d0dd73f1b931bd0595c5069209126b4a576d Branch_static.zip diff --git a/carthage-files/checksum_static_noidfa b/carthage-files/checksum_static_noidfa deleted file mode 100644 index 3a65cd2..0000000 --- a/carthage-files/checksum_static_noidfa +++ /dev/null @@ -1,2 +0,0 @@ -#checksum for Branch on Github -6e892c6f7a89386609dd063d1561af4eb4f6af33 Branch_static_noidfa.zip diff --git a/carthage-files/checksum_static_noidfa.txt b/carthage-files/checksum_static_noidfa.txt new file mode 100644 index 0000000..1f54f33 --- /dev/null +++ b/carthage-files/checksum_static_noidfa.txt @@ -0,0 +1,2 @@ +#checksum for Branch on Github +3d7c8c493bca6b3fc7677a93e95886eece78305f Branch_static_noidfa.zip