From 63907b07a75133dbf3b243a19fb83fd3f80494c9 Mon Sep 17 00:00:00 2001
From: Alzbeta-Knerova <74616042+Alzbeta-Knerova@users.noreply.github.com>
Date: Mon, 17 May 2021 16:29:13 +0200
Subject: [PATCH 1/6] Update README.md

Update Japanese doc
---
 doc/japanese/README.md | 67 +++++++++++++++++++++++++++++++++---------
 1 file changed, 53 insertions(+), 14 deletions(-)

diff --git a/doc/japanese/README.md b/doc/japanese/README.md
index ba7f1b0bd..29a9b21f1 100644
--- a/doc/japanese/README.md
+++ b/doc/japanese/README.md
@@ -17,12 +17,13 @@ Read this in other languages: [English][en-readme], [中文][zh-readme], [日本
       * [iMessage固有の設定](#basic-setup-imessage)
    * [Adjustログ](#adjust-logging)
    * [アプリのビルド](#build-the-app)
-* [追加機能](#additional-feature)
+* [追加機能](#additional-features)
    * [AppTrackingTransparency framework](#att-framework)
       * [アプリトラッキング承認ラッパー](#ata-wrapper)
       * [現在の承認ステータスを取得](#ata-getter)
    * [SKAdNetwork frameworks](#skadn-framework)
       * [SKAdNetworkのconversion valueを更新](#skadn-update-conversion-value)
+      * [Conversion value更新コールバック](#skadn-cv-updated-callback)
    * [イベントトラッキング](#event-tracking)
       * [収益のトラッキング](#revenue-tracking)
       * [収益の重複排除](#revenue-deduplication)
@@ -60,6 +61,7 @@ Read this in other languages: [English][en-readme], [中文][zh-readme], [日本
       * [iOS 9およびそれ以降のバージョンでのディープリンク](#deeplinking-setup-old)
       * [ディファードディープリンク](#deeplinking-deferred)
       * [ディープリンクを介したリアトリビューション](#deeplinking-reattribution)
+   * [[ベータ版]データレジデンシー](#data-residency)
 * [トラブルシューティング](#troubleshooting)
    * [SDK初期化時の問題](#ts-delayed-init)
    * ["Adjust requires ARC"というエラーが表示される](#ts-arc)
@@ -128,8 +130,8 @@ iOS 8リリース以降、Appleはdynamic frameworks（embedded frameworks）を
 iOS frameworksに対応したAdjust SDKの機能を利用する際は、以下のframeworkをXcodeに追加してください。
 
 - `AdSupport.framework` - SDKがIDFA値および（iOS 14より前の）LAT(Limited Ad Tracking)情報を呼び出します。
-- `iAd.framework` - SDKが配信中のASA（Apple Search Ads）キャンペーンのアトリビューションを自動的に処理します。（今後、廃止され`AdServices.framework`に置き換わる予定です）。
-- `AdServices.framework`- SDKがASAキャンペーンのアトリビューションを自動的に処理します。
+- `iAd.framework` - SDKが実行中のASAキャンペーンのアトリビューションを自動的に処理できるようにします。
+- `AdServices.framework` - iOS 14.3以降を実行するデバイスの場合、SDKがASAキャンペーンのアトリビューションを自動的に処理できるようになります。Apple Ads Attribution APIを利用する際に必要です。
 - `CoreTelephony.framework`- SDKが現在のRadio Access Technology（無線アクセス技術）を判別します。
 - `StoreKit.framework`- iOS 14またはそれ以降において、このframeworkは` SKAdNetwork` のframeworkにアクセスし、「SKAdNetwork」との通信をAdjust SDKで自動的に処理します。
 - `AppTrackingTransparency.framework` -iOS 14またはそれ以降において、このframeworkはSDKがトラッキングに対するユーザー同意を確認するダイアログをラップし、ユーザーの許諾状況を示す値にアクセスします。
@@ -218,7 +220,7 @@ Sandbox環境で計測された数値はSandboxレポートに表示されます
 
 **SDKをフレームワークとして追加する:** iMessageアプリケーションに`AdjustSdkIm.framework`を追加した後、`Build Phases`プロジェクト設定で`New Copy Files Phase`を追加します。AdjustSdkIm.framework`をFrameworks`フォルダにコピーするを選択してください。
 
-**セッショントラッキング：** セッショントラッキングをiMessageアプリで正しく機能させるためには、追加の実装ステップを1回実行します。標準のiOSアプリでは、Adjust SDKはiOSシステム通知に自動的に登録され、アプリがいつ入力されたか、フォアグラウンドになったかを知ることができます。これはiMessageアプリの場合には該当しないため、iMessageアプリビューコントローラの`trackSubsessionStart`メソッドと`trackSubsessionEnd`メソッドへの明示的な呼び出しを追加する必要があります。これにより、アプリがフォアグラウンドあるかどうかをSDKに認識させることができます。
+**セッショントラッキング:** セッショントラッキングをiMessageアプリで正しく機能させるためには、追加の実装ステップを1回実行します。標準のiOSアプリでは、Adjust SDKはiOSシステム通知に自動的に登録され、アプリがいつ入力されたか、フォアグラウンドになったかを知ることができます。これはiMessageアプリの場合には該当しないため、iMessageアプリビューコントローラの`trackSubsessionStart`メソッドと`trackSubsessionEnd`メソッドへの明示的な呼び出しを追加する必要があります。これにより、アプリがフォアグラウンドあるかどうかをSDKに認識させることができます。
 
 `didBecomeActiveWithConversation`のメソッド中に`trackSubsessionStart`を追加します。
 
@@ -250,7 +252,7 @@ Add call to `trackSubsessionEnd` inside of `willResignActiveWithConversation:` m
 
 このセットを使用すると、Adjust SDKはiMessageアプリ内でセッションのトラッキングを正常に行うことができます。
 
-注意：書き込んだiOSアプリとiMessageの拡張機能は、異なるメモリ空間で動作しており、バンドルIDも異なります。２つの場所で同じアプリトークンを使用してAdjust SDKを初期化すると、相互が認識しない2つの独立したインスタンスが生成され、ダッシュボードのデータが混在してしまうことがあります。これを避けるためには、iMessageアプリをAdjust管理画面に新規追加し、登録済みのiOSアプリと異なるアプリトークンを使ってSDKを初期化してください。
+**注意:** 書き込んだiOSアプリとiMessageの拡張機能は、異なるメモリ空間で動作しており、バンドルIDも異なります。２つの場所で同じアプリトークンを使用してAdjust SDKを初期化すると、相互が認識しない2つの独立したインスタンスが生成され、ダッシュボードのデータが混在してしまうことがあります。これを避けるためには、iMessageアプリをAdjust管理画面に新規追加し、登録済みのiOSアプリと異なるアプリトークンを使ってSDKを初期化してください。
 
 ### <a id="adjust-logging"></a>Adjustログ
 
@@ -372,6 +374,17 @@ iOS SDK v4.26.0では、Adjust SDKラッパーメソッド`updateConversionValue
 [Adjust updateConversionValue:6];
 ```
 
+### <a id="skadn-cv-updated-callback"></a>Conversion value更新コールバック
+
+コールバックを登録すると、Adjust SDKがユーザーのconversion valueを更新するたびに通知を受けることができます。`AdjustDelegate`プロトコルを実装し、オプションの`adjustConversionValueUpdated:`メソッドを実装する必要があります。
+
+```objc
+- (void)adjustConversionValueUpdated:(NSNumber *)conversionValue {
+    NSLog(@"Conversion value updated callback called!");
+    NSLog(@"Conversion value: %@", conversionValue);
+}
+```
+
 ### <a id="event-tracking"></a>イベントトラッキング
 
 Adjustではアプリ内イベントの計測も可能です。ここでは、特定のボタンに対するすべてのタップを計測する場合について説明します。[管理画面]で新しいイベントトークンを作成し、`abc123`というイベントトークンが発行されたとします。次に、ボタンの`buttonDown`メソッドで以下のコードを追加してタップを計測します。
@@ -401,7 +414,7 @@ ADJEvent *event = [ADJEvent eventWithEventToken:@"abc123"];
 
 通貨コードを設定すると、Adjustは計測された課金金額を設定されたレポート通貨に自動換算します。[通貨換算についての詳細はこちら][currency-conversion]をご覧ください。
 
-収益とイベントトラッキングの詳細については、[イベントトラッキングガイド][tracking-purchases-and-revenues] をご覧ください。
+収益とイベントトラッキングの詳細については、[イベントトラッキングガイド](https://help.adjust.com/ja/article/app-events#tracking-purchases-and-revenues)をご覧ください。
 
 ### <a id="revenue-deduplication"></a>収益の重複排除
 
@@ -602,20 +615,36 @@ Adjustの[該当するアトリビューションデータポリシー][attribut
 
 ### <a id="ad-revenue"></a>広告収益のトラッキング
 
-Adjust SDKを利用して、以下のメソッドを呼び出し広告収益情報をトラッキングできます。
+**注**：この広告収益計測APIは、ネイティブのSDK v4.29.0以降のみ利用可能です。
+
+Adjust SDKを利用して、以下のメソッドを呼び出し広告収益情報を計測することができます。
 
 ```objc
+// initilise ADJAdRevenue instance with appropriate ad revenue source
+ADJAdRevenue *adRevenue = [[ADJAdRevenue alloc] initWithSource:source];
+// pass revenue and currency values
+[adRevenue setRevenue:1.6currency:@"USD"];
+// pass optional parameters
+[adRevenue setAdImpressionsCount:adImpressionsCount];
+[adRevenue setAdRevenueUnit:adRevenueUnit];
+[adRevenue setAdRevenuePlacement:adRevenuePlacement];
+[adRevenue setAdRevenueNetwork:adRevenueNetwork];
+// attach callback and/or partner parameter if needed
+[adRevenue addCallbackParameter:key value:value];
+[adRevenue addPartnerParameter:key value:value];
+
+// track ad revenue
 [Adjust trackAdRevenue:source payload:payload];
 ```
 
-Adjust SDKにパスするメソッドの引数は以下の通りです。
-
-- `source` - 広告収益情報のソースを指定する`NSString`オブジェクト
-- `payload` - 広告収益のJSONを格納する`NSData`オブジェクト
-
 現在、Adjustは以下の`source`パラメーターの値のみ対応しています。
 
-- `ADJAdRevenueSourceMopub` - メディエーションプラットフォームのMoPubを示します（詳細は、[統合ガイド][sdk2sdk-mopub]を参照ください）。
+- `ADJAdRevenueSourceAppLovinMAX` - AppLovin MAXプラットフォームを示します。
+- `ADJAdRevenueSourceMopub` - MoPubプラットフォームを示します。
+- `ADJAdRevenueSourceAdMob` - AdMobプラットフォームを示します。
+- `ADJAdRevenueSourceIronSource` - IronSourceプラットフォームを示します。
+
+**注**：サポートされているすべてのソースとの連携の詳細については、このREADME以外にも追加のドキュメントが用意されます。また、この機能を利用するには、Adjust管理画面でのアプリの追加設定が必要となりますので、利用する前に必ずサポートチームに連絡し、すべての設定が正しく行われていることを確認してください。
 
 ### <a id="subscriptions"></a>サブスクリプショントラッキング
 
@@ -1038,6 +1067,17 @@ Adjustはディープリンクを使ったリエンゲージメントキャン
 }
 ```
 
+### <a id="data-residency"></a>[ベータ版]データレジデンシー
+
+データ所在地機能を有効にするには、`ADJConfig`インスタンスの`setUrlStrategy:`メソッドに、以下のいずれかの定数を指定して呼び出します：
+
+```objc
+[adjustConfig setUrlStrategy:ADJDataResidencyEU]; // for EU data residency region
+[adjustConfig setUrlStrategy:ADJDataResidencyTR]; // for Turkey data residency region
+```
+
+**注：** 現在、この機能はベータテスト段階です。この機能の利用をご希望の場合は、担当のアカウントマネージャーもしくはsupport@adjust.comまでお問い合わせください。この設定を有効にすると、SDKのトラフィックが遮断されるため、この機能がアプリで有効になっていることをサポートチームに確認する前に、この設定を有効にしないでください。
+
 ## <a id="troubleshooting"></a>よくある質問
 
 ### <a id="ts-delayed-init"></a>SDK初期化時の問題
@@ -1205,7 +1245,6 @@ Adjust SDKは、実装された通りにイベントを計測します。収益
 
 計測されるべきでない値がレポート画面に表示されている場合は、**金額の値を決定するロジックを確認してください**。
 
-
 [dashboard]:   http://adjust.com
 [adjust.com]:  http://adjust.com
 

From 3839a68e0fd0023007c619e2ccd6b104536d8a0d Mon Sep 17 00:00:00 2001
From: Joshua Kaplan <yhkaplan@gmail.com>
Date: Tue, 8 Jun 2021 14:28:51 +0900
Subject: [PATCH 2/6] Fix: Xcode 13 build errors

```
Multiple methods named 'attribution' found with mismatched result, parameter type or attributes
Implicit conversion of 'NSURLRequestAttribution' (aka 'enum NSURLRequestAttribution') to 'ADJAttribution * _Nullable' is disallowed with ARC
```

ref: https://github.com/adjust/ios_sdk/issues/546
---
 Adjust/Adjust.h | 2 +-
 Adjust/Adjust.m | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
index de4f68a09..53e1bb357 100644
--- a/Adjust/Adjust.h
+++ b/Adjust/Adjust.h
@@ -322,7 +322,7 @@ extern NSString * __nonnull const ADJDataResidencyUS;
 /**
  * Obtain singleton Adjust object.
  */
-+ (nullable id)getInstance;
++ (nullable instancetype)getInstance;
 
 - (void)appDidLaunch:(nullable ADJConfig *)adjustConfig;
 
diff --git a/Adjust/Adjust.m b/Adjust/Adjust.m
index 38e53c026..76625c9b4 100644
--- a/Adjust/Adjust.m
+++ b/Adjust/Adjust.m
@@ -53,14 +53,14 @@ @implementation Adjust
 static Adjust *defaultInstance = nil;
 static dispatch_once_t onceToken = 0;
 
-+ (id)getInstance {
++ (instancetype)getInstance {
     dispatch_once(&onceToken, ^{
         defaultInstance = [[self alloc] init];
     });
     return defaultInstance;
 }
 
-- (id)init {
+- (instancetype)init {
     self = [super init];
     if (self == nil) {
         return nil;

From 0904aa0883ab929e32ae748e0bdc13c3faa272f9 Mon Sep 17 00:00:00 2001
From: uerceg <ugi@adjust.com>
Date: Wed, 16 Jun 2021 00:10:54 +0200
Subject: [PATCH 3/6] update dedupe token logic & xcode 12.5

---
 Adjust.xcodeproj/project.pbxproj              |  2 +-
 .../xcshareddata/xcschemes/AdjustSdk.xcscheme |  2 +-
 .../xcschemes/AdjustSdkIm.xcscheme            |  2 +-
 .../xcschemes/AdjustSdkTv.xcscheme            |  2 +-
 .../xcschemes/AdjustSdkWebBridge.xcscheme     |  2 +-
 Adjust/ADJActivityState.m                     | 23 ++++--
 Adjust/ADJPackageBuilder.m                    | 72 +++++++++++++++----
 Adjust/ADJUtil.h                              |  6 ++
 Adjust/ADJUtil.m                              | 58 +++++++++++++++
 .../AdjustTestApp.xcodeproj/project.pbxproj   |  2 +-
 .../project.pbxproj                           |  2 +-
 .../project.pbxproj                           |  2 +-
 .../xcschemes/AdjustWebBridgeTestApp.xcscheme |  2 +-
 .../PocketSocket.xcodeproj/project.pbxproj    |  2 +-
 .../xcschemes/PocketSocket-Mac.xcscheme       |  2 +-
 .../xcschemes/PocketSocket.xcscheme           |  2 +-
 .../project.pbxproj                           |  2 +-
 .../project.pbxproj                           |  2 +-
 .../xcschemes/AdjustExample-ObjC.xcscheme     |  2 +-
 .../AdjustExample-ObjC/AppDelegate.m          | 18 ++---
 .../project.pbxproj                           |  2 +-
 .../xcschemes/AdjustExample-Swift.xcscheme    |  2 +-
 .../project.pbxproj                           |  2 +-
 .../project.pbxproj                           |  2 +-
 ...xample-iMessage MessagesExtension.xcscheme |  3 +-
 .../xcschemes/AdjustExample-iMessage.xcscheme |  2 +-
 .../project.pbxproj                           |  2 +-
 .../project.pbxproj                           |  2 +-
 28 files changed, 175 insertions(+), 49 deletions(-)

diff --git a/Adjust.xcodeproj/project.pbxproj b/Adjust.xcodeproj/project.pbxproj
index 2beead856..dba3610e3 100644
--- a/Adjust.xcodeproj/project.pbxproj
+++ b/Adjust.xcodeproj/project.pbxproj
@@ -2266,7 +2266,7 @@
 		9679920518BBAE2800394606 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "adjust GmbH";
 				TargetAttributes = {
 					9615158E1CD2CB2C0022D336 = {
diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme
index 0faa5f57a..15fe6c7d0 100644
--- a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme
+++ b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdk.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme
index d524e338e..20d2eecd4 100644
--- a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme
+++ b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkIm.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme
index b5242e34b..df56a4411 100644
--- a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme
+++ b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkTv.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme
index 4f4532333..55eba5fd8 100644
--- a/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme
+++ b/Adjust.xcodeproj/xcshareddata/xcschemes/AdjustSdkWebBridge.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Adjust/ADJActivityState.m b/Adjust/ADJActivityState.m
index 0c6097100..8e2eda4f1 100644
--- a/Adjust/ADJActivityState.m
+++ b/Adjust/ADJActivityState.m
@@ -9,6 +9,7 @@
 #import "ADJAdjustFactory.h"
 #import "ADJActivityState.h"
 #import "NSString+ADJAdditions.h"
+#import "ADJUtil.h"
 
 static const int kTransactionIdCount = 10;
 static NSString *appToken = nil;
@@ -23,7 +24,7 @@ - (id)init {
         return nil;
     }
 
-    [self assignRandomToken];
+    [self assignRandomToken:[ADJUtil generateRandomUuid]];
 
     self.eventCount = 0;
     self.sessionCount = 0;
@@ -81,8 +82,20 @@ - (BOOL)findTransactionId:(NSString *)transactionId {
 
 #pragma mark - Private & helper methods
 
-- (void)assignRandomToken {
-    self.dedupeToken = [[NSUUID UUID] UUIDString];
+- (void)assignRandomToken:(NSString *)randomToken {
+    // self.secondaryDedupeToken = [[NSUUID UUID] UUIDString];
+    NSString *persistedDedupeToken = [ADJUtil getPersistedRandomToken];
+    if (persistedDedupeToken != nil) {
+        if ((bool)[[NSUUID alloc] initWithUUIDString:persistedDedupeToken]) {
+            [[ADJAdjustFactory logger] verbose:@"Primary dedupe token successfully read"];
+            self.dedupeToken = persistedDedupeToken;
+            self.isPersisted = YES;
+            return;
+        }
+    }
+    
+    self.dedupeToken = randomToken;
+    self.isPersisted = [ADJUtil setPersistedRandomToken:self.dedupeToken];
 }
 
 - (NSString *)description {
@@ -110,10 +123,10 @@ - (id)initWithCoder:(NSCoder *)decoder {
     
     // Default values for migrating devices.
     if ([decoder containsValueForKey:@"uuid"]) {
-        self.dedupeToken = [decoder decodeObjectForKey:@"uuid"];
+        [self assignRandomToken:[decoder decodeObjectForKey:@"uuid"]];
     }
     if (self.dedupeToken == nil) {
-        [self assignRandomToken];
+        [self assignRandomToken:[ADJUtil generateRandomUuid]];
     }
 
     if ([decoder containsValueForKey:@"transactionIds"]) {
diff --git a/Adjust/ADJPackageBuilder.m b/Adjust/ADJPackageBuilder.m
index 58bc31e75..4e2e67fdb 100644
--- a/Adjust/ADJPackageBuilder.m
+++ b/Adjust/ADJPackageBuilder.m
@@ -397,7 +397,11 @@ - (NSMutableDictionary *)getSessionParameters:(BOOL)isInDelay {
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     if (!isInDelay) {
@@ -461,7 +465,11 @@ - (NSMutableDictionary *)getEventParameters:(BOOL)isInDelay forEventPackage:(ADJ
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     if (!isInDelay) {
@@ -547,7 +555,11 @@ - (NSMutableDictionary *)getInfoParameters:(NSString *)source {
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     if (self.attribution != nil) {
@@ -612,7 +624,11 @@ - (NSMutableDictionary *)getAdRevenueParameters:(NSString *)source payload:(NSDa
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     return parameters;
@@ -688,7 +704,11 @@ - (NSMutableDictionary *)getAdRevenueParameters:(ADJAdRevenue *)adRevenue isInDe
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     return parameters;
@@ -752,7 +772,11 @@ - (NSMutableDictionary *)getClickParameters:(NSString *)source {
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     if (self.attribution != nil) {
@@ -808,7 +832,11 @@ - (NSMutableDictionary *)getAttributionParameters:(NSString *)initiatedBy {
     }
 
     if (self.activityState != nil) {
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     return parameters;
@@ -856,7 +884,11 @@ - (NSMutableDictionary *)getGdprParameters {
     }
 
     if (self.activityState != nil) {
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     return parameters;
@@ -919,7 +951,11 @@ - (NSMutableDictionary *)getDisableThirdPartySharingParameters {
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     return parameters;
@@ -988,7 +1024,11 @@ - (NSMutableDictionary *)getThirdPartySharingParameters:(nonnull ADJThirdPartySh
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     return parameters;
@@ -1054,7 +1094,11 @@ - (NSMutableDictionary *)getMeasurementConsentParameters:(BOOL)enabled {
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     return parameters;
@@ -1107,7 +1151,11 @@ - (NSMutableDictionary *)getSubscriptionParameters:(BOOL)isInDelay forSubscripti
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.sessionLength forKey:@"session_length"];
         [ADJPackageBuilder parameters:parameters setInt:self.activityState.subsessionCount forKey:@"subsession_count"];
         [ADJPackageBuilder parameters:parameters setDuration:self.activityState.timeSpent forKey:@"time_spent"];
-        [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        if (self.activityState.isPersisted) {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"primary_dedupe_token"];
+        } else {
+            [ADJPackageBuilder parameters:parameters setString:self.activityState.dedupeToken forKey:@"secondary_dedupe_token"];
+        }
     }
 
     if (!isInDelay) {
diff --git a/Adjust/ADJUtil.h b/Adjust/ADJUtil.h
index d8e6bb7b2..0f76567eb 100644
--- a/Adjust/ADJUtil.h
+++ b/Adjust/ADJUtil.h
@@ -143,4 +143,10 @@ typedef void (^isInactiveInjected)(BOOL);
 
 + (NSString *)installedAt;
 
++ (NSString *)generateRandomUuid;
+
++ (NSString *)getPersistedRandomToken;
+
++ (BOOL)setPersistedRandomToken:(NSString *)randomToken;
+
 @end
diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
index 74476bca2..0e5630a26 100644
--- a/Adjust/ADJUtil.m
+++ b/Adjust/ADJUtil.m
@@ -1509,4 +1509,62 @@ + (NSString *)installedAt {
     return [ADJUtil formatDate:installTime];
 }
 
++ (NSString *)generateRandomUuid {
+    CFUUIDRef newUniqueId = CFUUIDCreate(kCFAllocatorDefault);
+    CFStringRef stringRef = CFUUIDCreateString(kCFAllocatorDefault, newUniqueId);
+    NSString *uuidString = (__bridge_transfer NSString*)stringRef;
+    NSString *lowerUuid = [uuidString lowercaseString];
+    CFRelease(newUniqueId);
+    return lowerUuid;
+}
+
++ (NSString *)getPersistedRandomToken {
+    NSMutableDictionary *keychainItem = [[NSMutableDictionary alloc] init];
+    keychainItem[(__bridge id)kSecAttrAccessible] = (__bridge id)kSecAttrAccessibleAfterFirstUnlock;
+    keychainItem[(__bridge id)kSecClass] = (__bridge id)kSecClassGenericPassword;
+    keychainItem[(__bridge id)kSecAttrAccount] = @"adjust_uuid";
+    keychainItem[(__bridge id)kSecAttrService] = @"deviceInfo";
+    if (!keychainItem) {
+        return nil;
+    }
+
+    keychainItem[(__bridge id)kSecReturnData] = (__bridge id)kCFBooleanTrue;
+    keychainItem[(__bridge id)kSecReturnAttributes] = (__bridge id)kCFBooleanTrue;
+    CFDictionaryRef result = nil;
+    OSStatus status = SecItemCopyMatching((__bridge CFDictionaryRef)keychainItem, (CFTypeRef *)&result);
+    if (status != noErr) {
+        return nil;
+    }
+
+    NSDictionary *resultDict = (__bridge_transfer NSDictionary *)result;
+    NSData *data = resultDict[(__bridge id)kSecValueData];
+    if (!data) {
+        return nil;
+    }
+
+    return [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
+}
+
++ (BOOL)setPersistedRandomToken:(NSString *)randomToken {
+    NSMutableDictionary *keychainItem = [[NSMutableDictionary alloc] init];
+    keychainItem[(__bridge id)kSecAttrAccessible] = (__bridge id)kSecAttrAccessibleAfterFirstUnlock;
+    keychainItem[(__bridge id)kSecClass] = (__bridge id)kSecClassGenericPassword;
+    keychainItem[(__bridge id)kSecAttrAccount] = @"adjust_uuid";
+    keychainItem[(__bridge id)kSecAttrService] = @"deviceInfo";
+    keychainItem[(__bridge id)kSecValueData] = [randomToken dataUsingEncoding:NSUTF8StringEncoding];
+    OSStatus status = SecItemAdd((__bridge CFDictionaryRef)keychainItem, NULL);
+    if (status != noErr) {
+        [[ADJAdjustFactory logger] warn:@"Primary dedupe token unsuccessfully written"];
+        return NO;
+    } else {
+        NSString *persistedRandomToken = [ADJUtil getPersistedRandomToken];
+        if ([randomToken isEqualToString:persistedRandomToken]) {
+            [[ADJAdjustFactory logger] debug:@"Primary dedupe token successfully written"];
+            return YES;
+        } else {
+            return NO;
+        }
+    }
+}
+
 @end
diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj b/AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj
index 1d97516b6..8266b0074 100644
--- a/AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj
+++ b/AdjustTests/AdjustTestApp/AdjustTestApp.xcodeproj/project.pbxproj
@@ -455,7 +455,7 @@
 		6F08421F2007769F00568A31 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = adjust;
 				TargetAttributes = {
 					6F0842262007769F00568A31 = {
diff --git a/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj b/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj
index 1a6f3e293..4732e8707 100644
--- a/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj
+++ b/AdjustTests/AdjustTestLibrary/AdjustTestLibrary.xcodeproj/project.pbxproj
@@ -251,7 +251,7 @@
 		6F0842042007766700568A31 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = adjust;
 				TargetAttributes = {
 					20E71745203B162B0073AC91 = {
diff --git a/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/project.pbxproj b/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/project.pbxproj
index 52b7bb9e1..698c79bc5 100644
--- a/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/project.pbxproj
+++ b/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/project.pbxproj
@@ -469,7 +469,7 @@
 		6F7AF61E211878B900F730B2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = adjust;
 				TargetAttributes = {
 					6F7AF625211878B900F730B2 = {
diff --git a/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme b/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme
index 3ba07743d..4cf04314e 100644
--- a/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme
+++ b/AdjustTests/AdjustWebBridgeTestApp/AdjustWebBridgeTestApp.xcodeproj/xcshareddata/xcschemes/AdjustWebBridgeTestApp.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/AdjustTests/PocketSocket/PocketSocket.xcodeproj/project.pbxproj b/AdjustTests/PocketSocket/PocketSocket.xcodeproj/project.pbxproj
index 7c9ca809d..7dfb8be4f 100644
--- a/AdjustTests/PocketSocket/PocketSocket.xcodeproj/project.pbxproj
+++ b/AdjustTests/PocketSocket/PocketSocket.xcodeproj/project.pbxproj
@@ -375,7 +375,7 @@
 		EEE5E30218B37DD500BAE47A /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Zwopple Limited";
 				TargetAttributes = {
 					EE453D0E1CABF60300A2EA13 = {
diff --git a/AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket-Mac.xcscheme b/AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket-Mac.xcscheme
index 4639b9184..e0035ac77 100644
--- a/AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket-Mac.xcscheme
+++ b/AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket-Mac.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket.xcscheme b/AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket.xcscheme
index e209a99b1..60777d1ee 100644
--- a/AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket.xcscheme
+++ b/AdjustTests/PocketSocket/PocketSocket.xcodeproj/xcshareddata/xcschemes/PocketSocket.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj b/examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj
index 0416f98dd..173cc57f2 100644
--- a/examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj
+++ b/examples/AdjustExample-FbPixel/AdjustExample-FbPixel.xcodeproj/project.pbxproj
@@ -355,7 +355,7 @@
 		9D9D1526212EB3920081445E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Adjust GmbH";
 				TargetAttributes = {
 					9D9D152D212EB3920081445E = {
diff --git a/examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/project.pbxproj b/examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/project.pbxproj
index 43f916f42..150084ae4 100644
--- a/examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/project.pbxproj
+++ b/examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/project.pbxproj
@@ -338,7 +338,7 @@
 		963909341BCBFCF300A2E8A4 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = adjust;
 				TargetAttributes = {
 					9639093B1BCBFCF300A2E8A4 = {
diff --git a/examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/xcshareddata/xcschemes/AdjustExample-ObjC.xcscheme b/examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/xcshareddata/xcschemes/AdjustExample-ObjC.xcscheme
index 6c15a64c7..3a5378e35 100644
--- a/examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/xcshareddata/xcschemes/AdjustExample-ObjC.xcscheme
+++ b/examples/AdjustExample-ObjC/AdjustExample-ObjC.xcodeproj/xcshareddata/xcschemes/AdjustExample-ObjC.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m b/examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m
index 04ce37556..947d3ae6e 100644
--- a/examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m
+++ b/examples/AdjustExample-ObjC/AdjustExample-ObjC/AppDelegate.m
@@ -32,30 +32,30 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     // Send in the background.
     // [adjustConfig setSendInBackground:YES];
-    
+
     // Set an attribution delegate.
     [adjustConfig setDelegate:self];
-    
+
     // Delay the first session of the SDK.
     // [adjustConfig setDelayStart:7];
-    
+
     // Add session callback parameters.
     [Adjust addSessionCallbackParameter:@"sp_foo" value:@"sp_bar"];
     [Adjust addSessionCallbackParameter:@"sp_key" value:@"sp_value"];
-    
+
     // Add session partner parameters.
     [Adjust addSessionPartnerParameter:@"sp_foo" value:@"sp_bar"];
     [Adjust addSessionPartnerParameter:@"sp_key" value:@"sp_value"];
-    
+
     // Remove session callback parameter.
     [Adjust removeSessionCallbackParameter:@"sp_key"];
-    
+
     // Remove session partner parameter.
     [Adjust removeSessionPartnerParameter:@"sp_foo"];
-    
+
     // Remove all session callback parameters.
     // [Adjust resetSessionCallbackParameters];
-    
+
     // Remove all session partner parameters.
     // [Adjust resetSessionPartnerParameters];
 
@@ -67,7 +67,7 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
 
     // Disable the SDK.
     // [Adjust setEnabled:NO];
-    
+
     // Interrupt delayed start set with setDelayStart: method.
     // [Adjust sendFirstPackages];
     
diff --git a/examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/project.pbxproj b/examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/project.pbxproj
index f890799e7..242164e3f 100644
--- a/examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/project.pbxproj
+++ b/examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/project.pbxproj
@@ -322,7 +322,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0730;
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "adjust GmbH";
 				TargetAttributes = {
 					9DF7A9C11CB4ECA600D3591F = {
diff --git a/examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/xcshareddata/xcschemes/AdjustExample-Swift.xcscheme b/examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/xcshareddata/xcschemes/AdjustExample-Swift.xcscheme
index 7859ccdb8..acdb82cee 100644
--- a/examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/xcshareddata/xcschemes/AdjustExample-Swift.xcscheme
+++ b/examples/AdjustExample-Swift/AdjustExample-Swift.xcodeproj/xcshareddata/xcschemes/AdjustExample-Swift.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/examples/AdjustExample-WebView/AdjustExample-WebView.xcodeproj/project.pbxproj b/examples/AdjustExample-WebView/AdjustExample-WebView.xcodeproj/project.pbxproj
index 873c6361c..217b31590 100644
--- a/examples/AdjustExample-WebView/AdjustExample-WebView.xcodeproj/project.pbxproj
+++ b/examples/AdjustExample-WebView/AdjustExample-WebView.xcodeproj/project.pbxproj
@@ -387,7 +387,7 @@
 		9D10829C1CFDAF8E0050568B /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "adjust GmbH";
 				TargetAttributes = {
 					9D1082A31CFDAF8E0050568B = {
diff --git a/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/project.pbxproj b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/project.pbxproj
index 2f4482300..b14995b32 100644
--- a/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/project.pbxproj
+++ b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/project.pbxproj
@@ -347,7 +347,7 @@
 		9D01675F20FF81280029CFFF /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Adjust GmbH";
 				TargetAttributes = {
 					9D01676420FF81280029CFFF = {
diff --git a/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme
index a427a184f..e48ddee2e 100644
--- a/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme	
+++ b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage MessagesExtension.xcscheme	
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    wasCreatedForAppExtension = "YES"
    version = "2.0">
    <BuildAction
@@ -83,6 +83,7 @@
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES"
+      askForAppToLaunch = "Yes"
       launchAutomaticallySubstyle = "2">
       <BuildableProductRunnable
          runnableDebuggingMode = "0">
diff --git a/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme
index aa2a48b24..60ee40435 100644
--- a/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme
+++ b/examples/AdjustExample-iMessage/AdjustExample-iMessage.xcodeproj/xcshareddata/xcschemes/AdjustExample-iMessage.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj/project.pbxproj b/examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj/project.pbxproj
index e9801ec68..d43f15ece 100644
--- a/examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj/project.pbxproj
+++ b/examples/AdjustExample-iWatch/AdjustExample-iWatch.xcodeproj/project.pbxproj
@@ -467,7 +467,7 @@
 		9DF7AC0C1CB4FEDB00D3591F /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "adjust GmbH";
 				TargetAttributes = {
 					9DF7AC131CB4FEDB00D3591F = {
diff --git a/examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj b/examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj
index df12d0ad1..9022c28f5 100644
--- a/examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj
+++ b/examples/AdjustExample-tvOS/AdjustExample-tvOS.xcodeproj/project.pbxproj
@@ -325,7 +325,7 @@
 		963909AA1BCC0D8300A2E8A4 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = adjust;
 				TargetAttributes = {
 					963909B11BCC0D8300A2E8A4 = {

From 72a87cd884db983c7e02b81050ce61e7c51534d7 Mon Sep 17 00:00:00 2001
From: uerceg <ugi@adjust.com>
Date: Wed, 16 Jun 2021 00:14:04 +0200
Subject: [PATCH 4/6] update version number to 4.29.3

---
 Adjust.podspec                                 | 4 ++--
 Adjust/ADJUtil.m                               | 2 +-
 Adjust/Adjust.h                                | 2 +-
 AdjustBridge/AdjustBridgeRegister.m            | 2 +-
 AdjustTests/AdjustUnitTests/ADJPackageFields.m | 2 +-
 README.md                                      | 4 ++--
 VERSION                                        | 2 +-
 doc/chinese/README.md                          | 4 ++--
 doc/english/migrate.md                         | 2 +-
 doc/english/web_views.md                       | 2 +-
 doc/japanese/README.md                         | 4 ++--
 doc/korean/README.md                           | 4 ++--
 doc/korean/web_views.md                        | 2 +-
 doc/migrate.md                                 | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/Adjust.podspec b/Adjust.podspec
index 7b5616a1a..263fdb96e 100644
--- a/Adjust.podspec
+++ b/Adjust.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name           = "Adjust"
-  s.version        = "4.29.2"
+  s.version        = "4.29.3"
   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         = { "Christian Wellenbrock" => "welle@adjust.com" }
-  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.29.2" }
+  s.source         = { :git => "https://github.com/adjust/ios_sdk.git", :tag => "v4.29.3" }
   s.ios.deployment_target = '6.0'
   s.tvos.deployment_target = '9.0'
   s.framework      = 'SystemConfiguration'
diff --git a/Adjust/ADJUtil.m b/Adjust/ADJUtil.m
index 0e5630a26..9a8a19d7e 100644
--- a/Adjust/ADJUtil.m
+++ b/Adjust/ADJUtil.m
@@ -39,7 +39,7 @@
 static NSRegularExpression *shortUniversalLinkRegex = nil;
 static NSRegularExpression *excludedDeeplinkRegex = nil;
 
-static NSString * const kClientSdk                  = @"ios4.29.2";
+static NSString * const kClientSdk                  = @"ios4.29.3";
 static NSString * const kDeeplinkParam              = @"deep_link=";
 static NSString * const kSchemeDelimiter            = @"://";
 static NSString * const kDefaultScheme              = @"AdjustUniversalScheme";
diff --git a/Adjust/Adjust.h b/Adjust/Adjust.h
index 53e1bb357..8b8f25407 100644
--- a/Adjust/Adjust.h
+++ b/Adjust/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.29.2
+//  V4.29.3
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
diff --git a/AdjustBridge/AdjustBridgeRegister.m b/AdjustBridge/AdjustBridgeRegister.m
index 214154701..f87de21d8 100644
--- a/AdjustBridge/AdjustBridgeRegister.m
+++ b/AdjustBridge/AdjustBridgeRegister.m
@@ -246,7 +246,7 @@ + (NSString *)adjust_js {
                 if (this.sdkPrefix) {
                     return this.sdkPrefix;
                 } else {
-                    return 'web-bridge4.29.2';
+                    return 'web-bridge4.29.3';
                 }
             },
             setTestOptions: function(testOptions) {
diff --git a/AdjustTests/AdjustUnitTests/ADJPackageFields.m b/AdjustTests/AdjustUnitTests/ADJPackageFields.m
index 11238481f..5c02afbe5 100644
--- a/AdjustTests/AdjustUnitTests/ADJPackageFields.m
+++ b/AdjustTests/AdjustUnitTests/ADJPackageFields.m
@@ -16,7 +16,7 @@ - (id) init {
 
     // default values
     self.appToken = @"qwerty123456";
-    self.clientSdk = @"ios4.29.2";
+    self.clientSdk = @"ios4.29.3";
     self.suffix = @"";
     self.environment = @"sandbox";
 
diff --git a/README.md b/README.md
index 7ba7204cb..65a45318f 100644
--- a/README.md
+++ b/README.md
@@ -86,13 +86,13 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
 If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
 
 ```ruby
-pod 'Adjust', '~> 4.29.2'
+pod 'Adjust', '~> 4.29.3'
 ```
 
 or:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.2'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.3'
 ```
 
 ---
diff --git a/VERSION b/VERSION
index 3660d52d6..763892f5c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-4.29.2
+4.29.3
diff --git a/doc/chinese/README.md b/doc/chinese/README.md
index 76b5aa0f3..f80573dd0 100644
--- a/doc/chinese/README.md
+++ b/doc/chinese/README.md
@@ -85,13 +85,13 @@
 如果您正在使用 [CocoaPods][cocoapods]，可以将以下代码行添加至 `Podfile`，然后继续进行[此步骤](#sdk-integrate)：
 
 ```ruby
-pod 'Adjust', '~> 4.29.2'
+pod 'Adjust', '~> 4.29.3'
 ```
 
 或：
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.2'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.3'
 ```
 
 ---
diff --git a/doc/english/migrate.md b/doc/english/migrate.md
index 5ef44eca7..a42d4b7ac 100644
--- a/doc/english/migrate.md
+++ b/doc/english/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for iOS to v4.29.2 from v3.4.0
+## Migrate your Adjust SDK for iOS to v4.29.3 from v3.4.0
 
 ### Initial setup
 
diff --git a/doc/english/web_views.md b/doc/english/web_views.md
index 6e1335ff5..92f2e28b7 100644
--- a/doc/english/web_views.md
+++ b/doc/english/web_views.md
@@ -64,7 +64,7 @@ We will describe the steps to integrate the Adjust SDK into your iOS project. We
 If you're using [CocoaPods][cocoapods], you can add the following line to your `Podfile` and continue from [this step](#sdk-integrate):
 
 ```ruby
-pod 'Adjust/WebBridge', '~> 4.29.2'
+pod 'Adjust/WebBridge', '~> 4.29.3'
 ```
 
 ---
diff --git a/doc/japanese/README.md b/doc/japanese/README.md
index 29a9b21f1..c1d6bb58d 100644
--- a/doc/japanese/README.md
+++ b/doc/japanese/README.md
@@ -85,13 +85,13 @@ Adjust SDKをiOSプロジェクトに導入する手順を説明します。Xcod
 [CocoaPods][cocoapods]を使用している場合は、Podfile`に下記のコードを追加し、[こちらの手順](#sdk-integrate)に進んでください。
 
 ```ruby
-pod 'Adjust', '~> 4.29.2'
+pod 'Adjust', '~> 4.29.3'
 ```
 
 または
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.2'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.3'
 ```
 
 ---
diff --git a/doc/korean/README.md b/doc/korean/README.md
index 15952e844..60f1c942c 100644
--- a/doc/korean/README.md
+++ b/doc/korean/README.md
@@ -85,13 +85,13 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S
 [CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 `Podfile`에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요.
 
 ```ruby
-pod `Adjust`, `~> 4.29.2`
+pod `Adjust`, `~> 4.29.3`
 ```
 
 또는:
 
 ```ruby
-pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.2'
+pod 'Adjust', :git => 'https://github.com/adjust/ios_sdk.git', :tag => 'v4.29.3'
 ```
 
 ---
diff --git a/doc/korean/web_views.md b/doc/korean/web_views.md
index cec63ca1b..ef4796054 100644
--- a/doc/korean/web_views.md
+++ b/doc/korean/web_views.md
@@ -64,7 +64,7 @@ iOS 개발용 Xcode를 사용한다는 가정하에 iOS 프로젝트에 Adjust S
 [CocoaPods][cocoapods]를 사용하는 경우, 다음 내용을 'Podfile'에 추가한 후 [해당 단계](#sdk-integrate)를 완료하세요.
 
 ```ruby
-pod 'Adjust/WebBridge', '~> 4.29.2'
+pod 'Adjust/WebBridge', '~> 4.29.3'
 ```
 
 ---
diff --git a/doc/migrate.md b/doc/migrate.md
index 5ef44eca7..a42d4b7ac 100644
--- a/doc/migrate.md
+++ b/doc/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for iOS to v4.29.2 from v3.4.0
+## Migrate your Adjust SDK for iOS to v4.29.3 from v3.4.0
 
 ### Initial setup
 

From 22528a80c7bcdf76253009d12dbd36308a544cc9 Mon Sep 17 00:00:00 2001
From: uerceg <ugi@adjust.com>
Date: Wed, 16 Jun 2021 00:15:35 +0200
Subject: [PATCH 5/6] update CHANGELOG

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d26e55154..1a0ede15a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+### Version 4.29.3 (16th June 2021)
+#### Fixed
+- Fixed compile time errors with Xcode 13 beta (thanks to @yhkaplan).
+
+---
+
 ### Version 4.29.2 (12th May 2021)
 #### Added
 - [beta] Added data residency support for US region. You can choose this setting by calling `setUrlStrategy:` method of `ADJConfig` instance with `ADJDataResidencyUS` parameter.

From ee18c10449e977b683ea97eb47396bc203cfc885 Mon Sep 17 00:00:00 2001
From: uerceg <ugi@adjust.com>
Date: Wed, 16 Jun 2021 22:46:03 +0200
Subject: [PATCH 6/6] clean up test app

---
 .../AdjustTestApp/AdjustTestApp/ViewController.h | 16 ++++++++--------
 .../AdjustTestApp/AdjustTestApp/ViewController.m |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.h b/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.h
index 0b0bea08b..e6060639d 100644
--- a/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.h
+++ b/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.h
@@ -9,15 +9,15 @@
 #import <UIKit/UIKit.h>
 
 // simulator
-//static NSString * baseUrl = @"http://127.0.0.1:8080";
-//static NSString * gdprUrl = @"http://127.0.0.1:8080";
-//static NSString * subscriptionUrl = @"http://127.0.0.1:8080";
-//static NSString * controlUrl = @"ws://127.0.0.1:1987";
+static NSString * baseUrl = @"http://127.0.0.1:8080";
+static NSString * gdprUrl = @"http://127.0.0.1:8080";
+static NSString * subscriptionUrl = @"http://127.0.0.1:8080";
+static NSString * controlUrl = @"ws://127.0.0.1:1987";
 // device
- static NSString * baseUrl = @"http://192.168.86.75:8080";
- static NSString * gdprUrl = @"http://192.168.86.75:8080";
- static NSString * subscriptionUrl = @"http://192.168.86.75:8080";
- static NSString * controlUrl = @"ws://192.168.86.75:1987";
+// static NSString * baseUrl = @"http://192.168.0.27:8080";
+// static NSString * gdprUrl = @"http://192.168.0.27:8080";
+// static NSString * subscriptionUrl = @"http://192.168.0.27:8080";
+// static NSString * controlUrl = @"ws://192.168.0.27:1987";
 
 @interface ViewController : UIViewController
 
diff --git a/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.m b/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.m
index 4ceb87713..91615b7c2 100644
--- a/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.m
+++ b/AdjustTests/AdjustTestApp/AdjustTestApp/ViewController.m
@@ -31,7 +31,7 @@ - (void)viewDidLoad {
     [self.adjustCommandExecutor setTestLibrary:self.testLibrary];
 
     // [self.testLibrary addTestDirectory:@"event-callbacks"];
-    // [self.testLibrary addTest:@"Test_AdRevenue_ad_revenue"];
+    // [self.testLibrary addTest:@"Test_Parameters"];
 
     // [self.testLibrary doNotExitAfterEnd];
     [self startTestSession];