Merge pull request #688 from adjust/v4360

Version 4.36.0

Adjust.podspec

@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.35.3"
+  s.version        = "4.36.0"
   s.summary        = "This is the iOS SDK of adjust. You can read more about it at http://adjust.com."
   s.homepage       = "https://github.com/adjust/ios_sdk"
   s.license        = { :type => 'MIT', :file => 'MIT-LICENSE' }
   s.author         = { "Adjust" => "sdk@adjust.com" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.35.2" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.36.0" }
   s.ios.deployment_target = '9.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'

Adjust/ADJUtil.m

@@ -35,7 +35,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.35.3";
+static NSString * const kClientSdk                  = @"ios4.36.0";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";

Adjust/Adjust.h

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.35.3
+//  V4.36.0
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
@@ -167,6 +167,14 @@ extern NSString * __nonnull const ADJDataResidencyUS;
  */
 + (nullable NSString *)idfa;
 
+/**
+ * @brief Retrieve iOS device IDFV value.
+ *
+ * @return Device IDFV value.
+ */
++ (nullable NSString *)idfv;
+
+
 /**
  * @brief Get current adjust identifier for the user.
  *

Adjust/Adjust.m

@@ -154,6 +154,12 @@ + (NSString *)idfa {
     }
 }
 
++ (NSString *)idfv {
+    @synchronized (self) {
+        return [[Adjust getInstance] idfv];
+    }
+}
+
 + (NSString *)sdkVersion {
     @synchronized (self) {
         return [[Adjust getInstance] sdkVersion];
@@ -437,6 +443,10 @@ - (NSString *)idfa {
     return [ADJUtil idfa];
 }
 
+- (NSString *)idfv {
+    return [ADJUtil idfv];
+}
+
 - (NSURL *)convertUniversalLink:(NSURL *)url scheme:(NSString *)scheme {
     return [ADJUtil convertUniversalLink:url scheme:scheme];
 }

AdjustBridge/AdjustBridge.m

@@ -431,6 +431,13 @@ - (void)loadWKWebViewBridge:(WKWebView *)wkWebView
         responseCallback([Adjust idfa]);
     }];
 
+    [self.bridgeRegister registerHandler:@"adjust_idfv" handler:^(id data, WVJBResponseCallback responseCallback) {
+        if (responseCallback == nil) {
+            return;
+        }
+        responseCallback([Adjust idfv]);
+    }];
+
     [self.bridgeRegister registerHandler:@"adjust_requestTrackingAuthorizationWithCompletionHandler" handler:^(id data, WVJBResponseCallback responseCallback) {
         if (responseCallback == nil) {
             return;

AdjustBridge/AdjustBridgeRegister.m

@@ -145,7 +145,12 @@ + (NSString *)adjust_js {
                 if (WebViewJavascriptBridge) {
                     WebViewJavascriptBridge.callHandler('adjust_idfa', null, callback);
                 }
-                },
+            },
+            getIdfv: function(callback) {
+                if (WebViewJavascriptBridge) {
+                    WebViewJavascriptBridge.callHandler('adjust_idfv', null, callback);
+                }
+            },
             requestTrackingAuthorizationWithCompletionHandler: function(callback) {
                 if (WebViewJavascriptBridge) {
                     WebViewJavascriptBridge.callHandler('adjust_requestTrackingAuthorizationWithCompletionHandler', null, callback);
@@ -275,7 +280,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.35.3';
+                    return 'web-bridge4.36.0';
                 }
             },
             setTestOptions: function(testOptions) {

CHANGELOG.md

@@ -1,3 +1,12 @@
+### Version 4.36.0 (21st November 2023)
+#### Added
+- Added `idfv` method on Adjust instance to get access to device's IDFV value.
+
+#### Fixed
+- Fixed the issue with CocoaPods installation for v4.35.3, where incorrect version was set as the source in podspec.
+
+---
+
 ### Version 4.35.3 (15th November 2023)
 #### Added
 - Added support for `TopOn` and `ADX` ad revenue sources.

VERSION

@@ -1 +1 @@
-4.35.3
+4.36.0

examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		07A893432B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A8933F2B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m */; };
+		07A893442B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A893402B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m */; };
+		07A893452B0B980B0011DAB8 /* ADJPurchase.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A893412B0B980B0011DAB8 /* ADJPurchase.m */; };
 		07AF832327BD3CBF00C5DD9E /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 07AF832227BD3CBF00C5DD9E /* Main.storyboard */; };
 		6FAB78C12636DDC400773869 /* ADJLinkResolution.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAB78BF2636DDC400773869 /* ADJLinkResolution.m */; };
 		9D49D17A290FEC2E00042345 /* ADJSKAdNetwork.m in Sources */ = {isa = PBXBuildFile; fileRef = 9D49D179290FEC2E00042345 /* ADJSKAdNetwork.m */; };
@@ -60,6 +63,12 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		07A8933D2B0B980B0011DAB8 /* ADJPurchase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchase.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchase.h"; sourceTree = "<group>"; };
+		07A8933E2B0B980B0011DAB8 /* ADJPurchaseVerificationResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchaseVerificationResult.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationResult.h"; sourceTree = "<group>"; };
+		07A8933F2B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchaseVerificationHandler.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationHandler.m"; sourceTree = "<group>"; };
+		07A893402B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchaseVerificationResult.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationResult.m"; sourceTree = "<group>"; };
+		07A893412B0B980B0011DAB8 /* ADJPurchase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchase.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchase.m"; sourceTree = "<group>"; };
+		07A893422B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchaseVerificationHandler.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationHandler.h"; sourceTree = "<group>"; };
 		07AF832227BD3CBF00C5DD9E /* Main.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Main.storyboard; sourceTree = "<group>"; };
 		6FAB78BF2636DDC400773869 /* ADJLinkResolution.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJLinkResolution.m; sourceTree = "<group>"; };
 		6FAB78C02636DDC400773869 /* ADJLinkResolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJLinkResolution.h; sourceTree = "<group>"; };
@@ -289,6 +298,12 @@
 				6FAB78BF2636DDC400773869 /* ADJLinkResolution.m */,
 				9D49D178290FEC2E00042345 /* ADJSKAdNetwork.h */,
 				9D49D179290FEC2E00042345 /* ADJSKAdNetwork.m */,
+				07A8933D2B0B980B0011DAB8 /* ADJPurchase.h */,
+				07A893412B0B980B0011DAB8 /* ADJPurchase.m */,
+				07A893422B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.h */,
+				07A8933F2B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m */,
+				07A8933E2B0B980B0011DAB8 /* ADJPurchaseVerificationResult.h */,
+				07A893402B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m */,
 			);
 			name = Adjust;
 			path = ../../../Adjust;
@@ -412,13 +427,16 @@
 				9DF92F202630F377000FC3FC /* ADJResponseData.m in Sources */,
 				9DF92F1C2630F377000FC3FC /* ADJActivityPackage.m in Sources */,
 				9DF92F0C2630F377000FC3FC /* ADJEventSuccess.m in Sources */,
+				07A893442B0B980B0011DAB8 /* ADJPurchaseVerificationResult.m in Sources */,
 				9DF92FB02630F3A1000FC3FC /* WKWebViewJavascriptBridge.m in Sources */,
+				07A893432B0B980B0011DAB8 /* ADJPurchaseVerificationHandler.m in Sources */,
 				9DF92F232630F377000FC3FC /* ADJUserDefaults.m in Sources */,
 				9DF92F182630F377000FC3FC /* NSData+ADJAdditions.m in Sources */,
 				9DF92F212630F377000FC3FC /* ADJPackageBuilder.m in Sources */,
 				9DF92F132630F377000FC3FC /* Adjust.m in Sources */,
 				9DF92F172630F377000FC3FC /* NSString+ADJAdditions.m in Sources */,
 				9DF92F052630F377000FC3FC /* ADJTimerOnce.m in Sources */,
+				07A893452B0B980B0011DAB8 /* ADJPurchase.m in Sources */,
 				9DF92F072630F377000FC3FC /* ADJRequestHandler.m in Sources */,
 				9DF92F122630F377000FC3FC /* ADJBackoffStrategy.m in Sources */,
 				9DF92F222630F377000FC3FC /* ADJSubscription.m in Sources */,

examples/AdjustExample-FbPixel/AdjustExample-FbPixel/AdjustExample-FbPixel.html

@@ -135,6 +135,14 @@ <h1 style="text-align:center;">Adjust Web View Demo</h1>
                         alert('IDFA\n' + idfa)
                     })
                 }
+
+                var btnGetIdfv = document.getElementById('btnGetIdfv')
+                btnGetIdfv.onclick = function(e) {
+                    e.preventDefault()
+                    Adjust.getIdfv(function(idfv) {
+                        alert('IDFV\n' + idfv)
+                    })
+                }
             })
         </script>
         <div id='buttons'>
@@ -169,6 +177,9 @@ <h1 style="text-align:center;">Adjust Web View Demo</h1>
                 <div style="width:300px;height:35px;text-align:center;">
                     <button id='btnGetIdfa'>Get IDFA</button>
                 </div>
+                <div style="width:300px;height:35px;text-align:center;">
+                    <button id='btnGetIdfv'>Get IDFV</button>
+                </div>
             </center>
         </div>
     </body></html>

examples/AdjustExample-Swift/Podfile.lock

@@ -1,7 +1,7 @@
 PODS:
-  - Adjust (4.35.3):
-    - Adjust/Core (= 4.35.3)
-  - Adjust/Core (4.35.3)
+  - Adjust (4.36.0):
+    - Adjust/Core (= 4.36.0)
+  - Adjust/Core (4.36.0)
 
 DEPENDENCIES:
   - Adjust (from `../../`)
@@ -11,7 +11,7 @@ EXTERNAL SOURCES:
     :path: "../../"
 
 SPEC CHECKSUMS:
-  Adjust: d82bf78d135ed930acdb73826aad67e66471eea9
+  Adjust: f2a3a162ae458dd9e5b5f432542ca75a68bb985b
 
 PODFILE CHECKSUM: 4c79da456db9adb90cdd42adc7f721c7bb6490cd
 

examples/AdjustExample-WebView/AdjustExample-WebView.xcodeproj/project.pbxproj

@@ -7,6 +7,9 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		07A8933A2B0B95D50011DAB8 /* ADJPurchaseVerificationResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A893362B0B95D50011DAB8 /* ADJPurchaseVerificationResult.m */; };
+		07A8933B2B0B95D50011DAB8 /* ADJPurchaseVerificationHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A893372B0B95D50011DAB8 /* ADJPurchaseVerificationHandler.m */; };
+		07A8933C2B0B95D50011DAB8 /* ADJPurchase.m in Sources */ = {isa = PBXBuildFile; fileRef = 07A893382B0B95D50011DAB8 /* ADJPurchase.m */; };
 		6F84513D25B1B1B40004C7C0 /* ADJThirdPartySharing.m in Sources */ = {isa = PBXBuildFile; fileRef = 6F84513B25B1B1B40004C7C0 /* ADJThirdPartySharing.m */; };
 		6FAB78AF2636DD6B00773869 /* ADJLinkResolution.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FAB78AE2636DD6B00773869 /* ADJLinkResolution.m */; };
 		6FBEE91124E4213900FEF3F1 /* ADJUrlStrategy.m in Sources */ = {isa = PBXBuildFile; fileRef = 6FBEE91024E4213800FEF3F1 /* ADJUrlStrategy.m */; };
@@ -63,6 +66,12 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		07A893342B0B95D50011DAB8 /* ADJPurchaseVerificationResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchaseVerificationResult.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationResult.h"; sourceTree = "<group>"; };
+		07A893352B0B95D50011DAB8 /* ADJPurchaseVerificationHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchaseVerificationHandler.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationHandler.h"; sourceTree = "<group>"; };
+		07A893362B0B95D50011DAB8 /* ADJPurchaseVerificationResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchaseVerificationResult.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationResult.m"; sourceTree = "<group>"; };
+		07A893372B0B95D50011DAB8 /* ADJPurchaseVerificationHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchaseVerificationHandler.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchaseVerificationHandler.m"; sourceTree = "<group>"; };
+		07A893382B0B95D50011DAB8 /* ADJPurchase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ADJPurchase.m; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchase.m"; sourceTree = "<group>"; };
+		07A893392B0B95D50011DAB8 /* ADJPurchase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ADJPurchase.h; path = "../../../Downloads/ios_sdk_dev-tracking_domain/Adjust/ADJPurchase.h"; sourceTree = "<group>"; };
 		6F84513B25B1B1B40004C7C0 /* ADJThirdPartySharing.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ADJThirdPartySharing.m; sourceTree = "<group>"; };
 		6F84513C25B1B1B40004C7C0 /* ADJThirdPartySharing.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJThirdPartySharing.h; sourceTree = "<group>"; };
 		6FAB78AD2636DD6B00773869 /* ADJLinkResolution.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ADJLinkResolution.h; sourceTree = "<group>"; };
@@ -310,6 +319,12 @@
 				6FAB78AE2636DD6B00773869 /* ADJLinkResolution.m */,
 				9D49D16C290FEBEB00042345 /* ADJSKAdNetwork.h */,
 				9D49D16D290FEBEB00042345 /* ADJSKAdNetwork.m */,
+				07A893392B0B95D50011DAB8 /* ADJPurchase.h */,
+				07A893382B0B95D50011DAB8 /* ADJPurchase.m */,
+				07A893352B0B95D50011DAB8 /* ADJPurchaseVerificationHandler.h */,
+				07A893372B0B95D50011DAB8 /* ADJPurchaseVerificationHandler.m */,
+				07A893342B0B95D50011DAB8 /* ADJPurchaseVerificationResult.h */,
+				07A893362B0B95D50011DAB8 /* ADJPurchaseVerificationResult.m */,
 			);
 			name = Adjust;
 			path = ../../../Adjust;
@@ -453,6 +468,7 @@
 				6F84513D25B1B1B40004C7C0 /* ADJThirdPartySharing.m in Sources */,
 				9DD0E9C41F4587C600B2A759 /* ADJUserDefaults.m in Sources */,
 				9D75F1991D07463800E5D222 /* WKWebViewJavascriptBridge.m in Sources */,
+				07A8933C2B0B95D50011DAB8 /* ADJPurchase.m in Sources */,
 				9D10833D1CFDD8F00050568B /* WKWebViewController.m in Sources */,
 				9D449EE51E6EDD4100E7E80B /* ADJConfig.m in Sources */,
 				9DF38239260E9DDE0033F5A1 /* NSNumber+ADJAdditions.m in Sources */,
@@ -470,7 +486,9 @@
 				9D49D16E290FEBEB00042345 /* ADJSKAdNetwork.m in Sources */,
 				9D449EF11E6EDD4100E7E80B /* ADJSdkClickHandler.m in Sources */,
 				9D449EDB1E6EDD4100E7E80B /* ADJActivityKind.m in Sources */,
+				07A8933B2B0B95D50011DAB8 /* ADJPurchaseVerificationHandler.m in Sources */,
 				9D449EDE1E6EDD4100E7E80B /* NSData+ADJAdditions.m in Sources */,
+				07A8933A2B0B95D50011DAB8 /* ADJPurchaseVerificationResult.m in Sources */,
 				9D449EED1E6EDD4100E7E80B /* ADJPackageBuilder.m in Sources */,
 				6FAB78AF2636DD6B00773869 /* ADJLinkResolution.m in Sources */,
 				9D449EF01E6EDD4100E7E80B /* ADJResponseData.m in Sources */,

examples/AdjustExample-WebView/AdjustExample-WebView/AdjustExample-WebView.html

@@ -147,6 +147,14 @@ <h1 style="width:300px;height:35px;text-align:center;">Adjust Web View Demo</h1>
             })
         }
 
+        var btnGetIdfv = document.getElementById('btnGetIdfv')
+        btnGetIdfv.onclick = function(e) {
+            e.preventDefault()
+            Adjust.getIdfv(function(idfv) {
+                alert('IDFV\n' + idfv)
+            })
+        }
+
         var btnAskTrackingPermission = document.getElementById('btnAskTrackingPermission')
         btnAskTrackingPermission.onclick = function(e) {
             e.preventDefault()
@@ -188,6 +196,9 @@ <h1 style="width:300px;height:35px;text-align:center;">Adjust Web View Demo</h1>
         <div style="width:300px;height:35px;text-align:center;">
             <button id='btnGetIdfa'>Get IDFA</button>
         </div>
+        <div style="width:300px;height:35px;text-align:center;">
+            <button id='btnGetIdfv'>Get IDFV</button>
+        </div>
         <div style="width:300px;height:35px;text-align:center;">
             <button id='btnAskTrackingPermission'>Ask tracking permission</button>
         </div>