Merge pull request #220 from adjust/v4291

uerceg · web-flow · commit c2e4b5d7a0ec · 2021-05-13T00:31:37.000+02:00
Version 4.29.1
diff --git a/Assets/Adjust/Android/AdjustAndroid.cs b/Assets/Adjust/Android/AdjustAndroid.cs
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity4.29.0";
+        private const string sdkPrefix = "unity4.29.1";
         private static bool launchDeferredDeeplink = true;
         private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");
         private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");
@@ -145,6 +145,11 @@ public static void Start(AdjustConfig adjustConfig)
                     AndroidJavaObject ajoDataResidencyTR = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("DATA_RESIDENCY_TR");
                     ajoAdjustConfig.Call("setUrlStrategy", ajoDataResidencyTR);
                 }
+                else if (adjustConfig.urlStrategy == AdjustConfig.AdjustDataResidencyUS)
+                {
+                    AndroidJavaObject ajoDataResidencyUS = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("DATA_RESIDENCY_US");
+                    ajoAdjustConfig.Call("setUrlStrategy", ajoDataResidencyUS);
+                }
             }
 
             // Check if user has set app secret.
diff --git a/Assets/Adjust/Android/adjust-android.jar b/Assets/Adjust/Android/adjust-android.jar
diff --git a/Assets/Adjust/Unity/AdjustConfig.cs b/Assets/Adjust/Unity/AdjustConfig.cs
@@ -9,6 +9,7 @@ public class AdjustConfig
 
         public const string AdjustDataResidencyEU = "data-residency-eu";
         public const string AdjustDataResidencyTR = "data-residency-tr";
+        public const string AdjustDataResidencyUS = "data-residency-us";
 
         public const string AdjustAdRevenueSourceAppLovinMAX = "applovin_max_sdk";
         public const string AdjustAdRevenueSourceMopub = "mopub";
diff --git a/Assets/Adjust/Windows/AdjustWindows.cs b/Assets/Adjust/Windows/AdjustWindows.cs
@@ -17,7 +17,7 @@ namespace com.adjust.sdk
 {
     public class AdjustWindows
     {
-        private const string sdkPrefix = "unity4.29.0";
+        private const string sdkPrefix = "unity4.29.1";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)
diff --git a/Assets/Adjust/iOS/Adjust.h b/Assets/Adjust/iOS/Adjust.h
@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust SDK
 //
-//  V4.29.0
+//  V4.29.2
 //  Created by Christian Wellenbrock (@wellle) on 23rd July 2013.
 //  Copyright (c) 2012-2021 Adjust GmbH. All rights reserved.
 //
@@ -55,6 +55,7 @@ extern NSString * __nonnull const ADJUrlStrategyIndia;
 extern NSString * __nonnull const ADJUrlStrategyChina;
 extern NSString * __nonnull const ADJDataResidencyEU;
 extern NSString * __nonnull const ADJDataResidencyTR;
+extern NSString * __nonnull const ADJDataResidencyUS;
 
 /**
  * @brief The main interface to Adjust.
diff --git a/Assets/Adjust/iOS/AdjustSdk.a b/Assets/Adjust/iOS/AdjustSdk.a
diff --git a/Assets/Adjust/iOS/AdjustUnity.mm b/Assets/Adjust/iOS/AdjustUnity.mm
@@ -234,6 +234,8 @@ void _AdjustLaunchApp(const char* appToken,
                 [adjustConfig setUrlStrategy:ADJDataResidencyEU];
             } else if ([stringUrlStrategy isEqualToString:@"data-residency-tr"]) {
                 [adjustConfig setUrlStrategy:ADJDataResidencyTR];
+            } else if ([stringUrlStrategy isEqualToString:@"data-residency-us"]) {
+                [adjustConfig setUrlStrategy:ADJDataResidencyUS];
             }
         }
 
diff --git a/Assets/Adjust/iOS/AdjustiOS.cs b/Assets/Adjust/iOS/AdjustiOS.cs
@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.29.0";
+        private const string sdkPrefix = "unity4.29.1";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
diff --git a/Assets/AdjustOaid/Android/adjust-android-oaid.jar b/Assets/AdjustOaid/Android/adjust-android-oaid.jar
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,17 @@
+### Version 4.29.1 (13th May 2021)
+#### Added
+- [beta] Added data residency support for US region. You can choose this setting by calling `setUrlStrategy` method of `AdjustConfig` instance with `AdjustConfig.AdjustDataResidencyUS` parameter.
+
+#### Fixed
+- Removed 5 decimal places formatting for ad revenue value.
+
+#### Native SDKs
+- [iOS@v4.29.2][ios_sdk_v4.29.2]
+- [Android@v4.28.1][android_sdk_v4.28.1]
+- [Windows@v4.17.0][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.29.0 (27th April 2021)
 #### Added
 - Added `conversionValueUpdatedDelegate` callback to `AdjustConfig` which can be used to get information when Adjust SDK updates conversion value for the user.
@@ -8,6 +22,11 @@
 #### Changed
 - Removed unused ad revenue constants.
 
+#### Native SDKs
+- [iOS@v4.29.0][ios_sdk_v4.29.0]
+- [Android@v4.28.0][android_sdk_v4.28.0]
+- [Windows@v4.17.0][windows_sdk_v4.17.0]
+
 ---
 
 ### Version 4.28.0 (1th April 2021)
@@ -892,6 +911,8 @@
 [ios_sdk_v4.26.2]: https://github.com/adjust/ios_sdk/tree/v4.26.2
 [ios_sdk_v4.27.1]: https://github.com/adjust/ios_sdk/tree/v4.27.1
 [ios_sdk_v4.28.0]: https://github.com/adjust/ios_sdk/tree/v4.28.0
+[ios_sdk_v4.29.0]: https://github.com/adjust/ios_sdk/tree/v4.29.0
+[ios_sdk_v4.29.2]: https://github.com/adjust/ios_sdk/tree/v4.29.2
 
 [android_sdk_v3.5.0]: https://github.com/adjust/android_sdk/tree/v3.5.0
 [android_sdk_v4.1.0]: https://github.com/adjust/android_sdk/tree/v4.1.0
@@ -924,6 +945,8 @@
 [android_sdk_v4.25.0]: https://github.com/adjust/android_sdk/tree/v4.25.0
 [android_sdk_v4.26.1]: https://github.com/adjust/android_sdk/tree/v4.26.1
 [android_sdk_v4.27.0]: https://github.com/adjust/android_sdk/tree/v4.27.0
+[android_sdk_v4.28.0]: https://github.com/adjust/android_sdk/tree/v4.28.0
+[android_sdk_v4.28.1]: https://github.com/adjust/android_sdk/tree/v4.28.1
 
 [windows_sdk_v4.12.0]: https://github.com/adjust/windows_sdk/tree/v4.12.0
 [windows_sdk_v4.13.0]: https://github.com/adjust/windows_sdk/tree/v4.13.0
diff --git a/README.md b/README.md
@@ -1171,11 +1171,12 @@ Upon receiving this information, Adjust changes sharing the specific user's data
 
 ### <a id="ad-data-residency"></a>[beta] Data residency
 
-In order to enable data residency feature, make sure to make a call to `setUrlStrategy:` method of the `ADJConfig` instance with one of the following constants:
+In order to enable data residency feature, make sure to make a call to `setUrlStrategy` method of the `AdjustConfig` instance with one of the following constants:
 
 ```objc
 adjustConfig.setUrlStrategy(AdjustConfig.AdjustDataResidencyEU); // for EU data residency region
 adjustConfig.setUrlStrategy(AdjustConfig.AdjustDataResidencyTR); // for Turkey data residency region
+adjustConfig.setUrlStrategy(AdjustConfig.AdjustDataResidencyUS); // for US data residency region
 ```
 
 **Note:** This feature is currently in beta testing phase. If you are interested in getting access to it, please contact your dedicated account manager or write an email to support@adjust.com. Please, do not turn this setting on before making sure with the support team that this feature is enabled for your app because otherwise SDK traffic will get dropped.
@@ -1210,7 +1211,7 @@ If needed, disable dSYM File. In the `Project Navigator`, select the `Unity-iPho
 [android-deeplinking]:     https://github.com/adjust/android_sdk#deep-linking
 [google_play_services]:    http://developer.android.com/google/play-services/setup.html
 [android_sdk_download]:    https://developer.android.com/sdk/index.html#Other
-[install-referrer-aar]:    https://maven.google.com/com/android/installreferrer/installreferrer/1.0/installreferrer-1.0.aar
+[install-referrer-aar]:    https://maven.google.com/com/android/installreferrer/installreferrer/2.2/installreferrer-2.2.aar
 [android-custom-receiver]: https://github.com/adjust/android_sdk/blob/master/doc/english/referrer.md
 
 [menu_android]:             https://raw.github.com/adjust/adjust_sdk/master/Resources/unity/v4/menu_android.png
@@ -1221,15 +1222,15 @@ If needed, disable dSYM File. In the `Project Navigator`, select the `Unity-iPho
 
 ## License
 
-### <a id="license"></a>License agreement
+### <a id="license"></a>License
 
 The file mod_pbxproj.py is licensed under the Apache License, Version 2.0 (the "License").
 You may not use this file except in compliance with the License.
 You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 
 The Adjust SDK is licensed under the MIT License.
 
-Copyright (c) 2012-2020 Adjust GmbH, http://www.adjust.com
+Copyright (c) 2012-2021 Adjust GmbH, http://www.adjust.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.29.0
+4.29.1
diff --git a/doc/english/migration/migrate.md b/doc/english/migration/migrate.md
@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Unity3d to 4.29.0 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.29.1 from 3.4.4
 
 ### Migration procedure
 
diff --git a/ext/android/sdk b/ext/android/sdk
@@ -1 +1 @@
-Subproject commit a5b9dbbda361b97a75649e15da8d33472935cf2b
+Subproject commit af7043f1fe6656d62bbce2122dda688b310f24c7
diff --git a/ext/ios/sdk b/ext/ios/sdk
@@ -1 +1 @@
-Subproject commit a01d2e00c6f5c0dcb723dbac2332d1685021a04d
+Subproject commit e79ef64645d3fd3e12615f0850923de0c14439ca

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace com.adjust.sdk`
`8`	`8`	`#if UNITY_ANDROID`
`9`	`9`	`public class AdjustAndroid`
`10`	`10`	`{`
`11`		`- private const string sdkPrefix = "unity4.29.0";`
	`11`	`+ private const string sdkPrefix = "unity4.29.1";`
`12`	`12`	`private static bool launchDeferredDeeplink = true;`
`13`	`13`	`private static AndroidJavaClass ajcAdjust = new AndroidJavaClass("com.adjust.sdk.Adjust");`
`14`	`14`	`private static AndroidJavaObject ajoCurrentActivity = new AndroidJavaClass("com.unity3d.player.UnityPlayer").GetStatic<AndroidJavaObject>("currentActivity");`
`@@ -145,6 +145,11 @@ public static void Start(AdjustConfig adjustConfig)`
`145`	`145`	`AndroidJavaObject ajoDataResidencyTR = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("DATA_RESIDENCY_TR");`
`146`	`146`	`ajoAdjustConfig.Call("setUrlStrategy", ajoDataResidencyTR);`
`147`	`147`	`}`
	`148`	`+ else if (adjustConfig.urlStrategy == AdjustConfig.AdjustDataResidencyUS)`
	`149`	`+ {`
	`150`	`+ AndroidJavaObject ajoDataResidencyUS = new AndroidJavaClass("com.adjust.sdk.AdjustConfig").GetStatic<AndroidJavaObject>("DATA_RESIDENCY_US");`
	`151`	`+ ajoAdjustConfig.Call("setUrlStrategy", ajoDataResidencyUS);`
	`152`	`+ }`
`148`	`153`	`}`
`149`	`154`
`150`	`155`	`// Check if user has set app secret.`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ namespace com.adjust.sdk`
`17`	`17`	`{`
`18`	`18`	`public class AdjustWindows`
`19`	`19`	`{`
`20`		`- private const string sdkPrefix = "unity4.29.0";`
	`20`	`+ private const string sdkPrefix = "unity4.29.1";`
`21`	`21`	`private static bool appLaunched = false;`
`22`	`22`
`23`	`23`	`public static void Start(AdjustConfig adjustConfig)`
Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,8 @@ void _AdjustLaunchApp(const char* appToken,`
`234`	`234`	`[adjustConfig setUrlStrategy:ADJDataResidencyEU];`
`235`	`235`	`} else if ([stringUrlStrategy isEqualToString:@"data-residency-tr"]) {`
`236`	`236`	`[adjustConfig setUrlStrategy:ADJDataResidencyTR];`
	`237`	`+ } else if ([stringUrlStrategy isEqualToString:@"data-residency-us"]) {`
	`238`	`+ [adjustConfig setUrlStrategy:ADJDataResidencyUS];`
`237`	`239`	`}`
`238`	`240`	`}`
`239`	`241`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ namespace com.adjust.sdk`
`8`	`8`	`#if UNITY_IOS`
`9`	`9`	`public class AdjustiOS`
`10`	`10`	`{`
`11`		`- private const string sdkPrefix = "unity4.29.0";`
	`11`	`+ private const string sdkPrefix = "unity4.29.1";`
`12`	`12`
`13`	`13`	`[DllImport("__Internal")]`
`14`	`14`	`private static extern void _AdjustLaunchApp(`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-## Migrate your Adjust SDK for Unity3d to 4.29.0 from 3.4.4`
	`1`	`+## Migrate your Adjust SDK for Unity3d to 4.29.1 from 3.4.4`
`2`	`2`
`3`	`3`	`### Migration procedure`
`4`	`4`