SDK-620 prep for release. Minor text correction. Update carthage project

BranchMetrics · Nov 13, 2019 · a569003 · a569003
1 parent d776d21
commit a569003
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 7 deletions.
diff --git a/Branch-SDK/Branch-SDK/Branch.h b/Branch-SDK/Branch-SDK/Branch.h
@@ -626,15 +626,15 @@ typedef NS_ENUM(NSUInteger, BranchCreditHistoryOrder) {
 /**
  Check for Apple Search Ads before initialization.
  
- This will usually add less than 1 second to first time startup.  Up to 3.5 seconds if Apple Search Ads fails to respond.
+ This will usually add less than 1 second on first time startup.  Up to 3.5 seconds if Apple Search Ads fails to respond.
  */
 - (void)delayInitToCheckForSearchAds;
 
 /**
  Increases the amount of time the SDK waits for Apple Search Ads to respond.
  The default wait has a better than 90% success rate, however waiting longer can improve the success rate.
 
- This will increase the usual delay to about 3 seconds to first time startup.  Up to about 15 seconds if Apple Search Ads fails to respond.
+ This will increase the usual delay to about 3 seconds on first time startup.  Up to about 15 seconds if Apple Search Ads fails to respond.
  */
 - (void)useLongerWaitForAppleSearchAds;
 

diff --git a/Branch.podspec b/Branch.podspec
@@ -27,11 +27,7 @@ Use the Branch SDK (branch.io) to create and power the links that point back to
 
   s.subspec 'Core' do |core|
     core.source_files = source_files
-    core.frameworks = 'AdSupport', 'MobileCoreServices', 'SafariServices', 'WebKit', 'iAd'
+    core.frameworks = 'AdSupport', 'MobileCoreServices', 'WebKit', 'iAd'
   end
 
-  s.subspec 'without-Safari' do |safari|
-    safari.source_files = source_files
-    safari.frameworks = 'AdSupport', 'MobileCoreServices', 'WebKit', 'iAd'
-  end
 end
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,16 @@
 Branch iOS SDK Change Log
 
+- v0.30.0
+* _*Master Release*_ - Nov 13, 2019
+  * SDK-513 update Apple Search Ads behavior and API
+  * SDK-614 last attributed touch API now accepts attribution window
+  * SDK-605 add blacklist url configuration
+  * SDK-608 remove deprecated Safari cookie integration
+  * SDK-598 fix race condition on SDK init
+  * SDK-603 fix Carthage build from source
+  * SDK-554 fix Swift getInstance nullability
+  * SDK-450 fix object serialization error
+
 - v0.29.3
 * _*Master Release*_ - Oct 16, 2019
   * SDK-594 fix Tune data check

diff --git a/carthage-files/BranchSDK.xcodeproj/project.pbxproj b/carthage-files/BranchSDK.xcodeproj/project.pbxproj
@@ -80,6 +80,8 @@
 		4DB5673A1E79FDAF00A8A324 /* BranchShareLink.h in Headers */ = {isa = PBXBuildFile; fileRef = 4DB567381E79FDAF00A8A324 /* BranchShareLink.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; };
 		4DB5673B1E79FDAF00A8A324 /* BranchShareLink.m in Sources */ = {isa = PBXBuildFile; fileRef = 4DB567391E79FDAF00A8A324 /* BranchShareLink.m */; platformFilter = ios; };
 		4DCF4B011F438A2B00AF9AAB /* BNCLog.h in Headers */ = {isa = PBXBuildFile; fileRef = 2BD7C3D91F27CEDB003696AF /* BNCLog.h */; platformFilter = ios; settings = {ATTRIBUTES = (Public, ); }; };
+		5F7DB5FB237C95C30077A95F /* BNCAppleAdClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F7DB5F9237C95C30077A95F /* BNCAppleAdClient.h */; platformFilter = ios; };
+		5F7DB5FC237C95C30077A95F /* BNCAppleAdClient.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F7DB5FA237C95C30077A95F /* BNCAppleAdClient.m */; };
 		5F8FC239236BB18A00B8474A /* BNCFacebookAppLinks.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F8FC235236BB18900B8474A /* BNCFacebookAppLinks.m */; };
 		5F8FC23A236BB18A00B8474A /* BNCAppleSearchAds.h in Headers */ = {isa = PBXBuildFile; fileRef = 5F8FC236236BB18900B8474A /* BNCAppleSearchAds.h */; platformFilter = ios; };
 		5F8FC23B236BB18A00B8474A /* BNCAppleSearchAds.m in Sources */ = {isa = PBXBuildFile; fileRef = 5F8FC237236BB18A00B8474A /* BNCAppleSearchAds.m */; };
@@ -216,6 +218,8 @@
 		4DB328041FA10C6300ACF9B0 /* BranchEvent.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchEvent.m; sourceTree = "<group>"; };
 		4DB567381E79FDAF00A8A324 /* BranchShareLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BranchShareLink.h; sourceTree = "<group>"; };
 		4DB567391E79FDAF00A8A324 /* BranchShareLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BranchShareLink.m; sourceTree = "<group>"; };
+		5F7DB5F9237C95C30077A95F /* BNCAppleAdClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCAppleAdClient.h; sourceTree = "<group>"; };
+		5F7DB5FA237C95C30077A95F /* BNCAppleAdClient.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCAppleAdClient.m; sourceTree = "<group>"; };
 		5F8FC235236BB18900B8474A /* BNCFacebookAppLinks.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCFacebookAppLinks.m; sourceTree = "<group>"; };
 		5F8FC236236BB18900B8474A /* BNCAppleSearchAds.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BNCAppleSearchAds.h; sourceTree = "<group>"; };
 		5F8FC237236BB18A00B8474A /* BNCAppleSearchAds.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = BNCAppleSearchAds.m; sourceTree = "<group>"; };
@@ -351,6 +355,8 @@
 		E230A1141D03DB9E006181D8 /* Branch-SDK */ = {
 			isa = PBXGroup;
 			children = (
+				5F7DB5F9237C95C30077A95F /* BNCAppleAdClient.h */,
+				5F7DB5FA237C95C30077A95F /* BNCAppleAdClient.m */,
 				5F8FC236236BB18900B8474A /* BNCAppleSearchAds.h */,
 				5F8FC237236BB18A00B8474A /* BNCAppleSearchAds.m */,
 				5F8FC238236BB18A00B8474A /* BNCFacebookAppLinks.h */,
@@ -478,6 +484,7 @@
 				4D1ED27E1FB3A43A007390A8 /* BNCAvailability.h in Headers */,
 				E2B9477B1D15E31700F2270D /* BNCCallbacks.h in Headers */,
 				4D3922BD1E1F0C85004FB7C8 /* BNCCommerceEvent.h in Headers */,
+				5F7DB5FB237C95C30077A95F /* BNCAppleAdClient.h in Headers */,
 				E230A16C1D03DB9E006181D8 /* BNCConfig.h in Headers */,
 				5F9071CC233D5FE4003AACAD /* BranchLATDRequest.h in Headers */,
 				5F9071CE233D5FE4003AACAD /* BranchCPIDRequest.h in Headers */,
@@ -634,6 +641,7 @@
 				5F8FC23B236BB18A00B8474A /* BNCAppleSearchAds.m in Sources */,
 				4D1851CA2019127700E48994 /* BNCKeyChain.m in Sources */,
 				4DAB17A51EE8A31B0079EEB4 /* BNCServerRequestQueue.m in Sources */,
+				5F7DB5FC237C95C30077A95F /* BNCAppleAdClient.m in Sources */,
 				E230A1901D03DB9E006181D8 /* BranchLinkProperties.m in Sources */,
 				4DAB17A91EE8A31B0079EEB4 /* BranchCloseRequest.m in Sources */,
 				4DAB17B71EE8A31B0079EEB4 /* BranchRegisterViewRequest.m in Sources */,