Merge pull request #164 from adjust/v4200

Version 4.20.0

Author: uerceg

Assets/Adjust/Android/AdjustAndroid.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_ANDROID
     public class AdjustAndroid
     {
-        private const string sdkPrefix = "unity4.19.2";
+        private const string sdkPrefix = "unity4.20.0";
         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");
@@ -104,6 +104,12 @@ public static void Start(AdjustConfig adjustConfig)
                 ajoAdjustConfig.Call("setDefaultTracker", adjustConfig.defaultTracker);
             }
 
+            // Check if user has set external device identifier.
+            if (adjustConfig.externalDeviceId != null)
+            {
+                ajoAdjustConfig.Call("setExternalDeviceId", adjustConfig.externalDeviceId);
+            }
+
             // Check if user has set app secret.
             if (IsAppSecretSet(adjustConfig))
             {

Assets/Adjust/Android/adjust-android.jar

@@ -252,6 +252,11 @@ private void Config()
                 adjustConfig.setDefaultTracker(_command.GetFirstParameterValue("defaultTracker"));
             }
 
+            if (_command.ContainsParameter("externalDeviceId"))
+            {
+                adjustConfig.setExternalDeviceId(_command.GetFirstParameterValue("externalDeviceId"));
+            }
+
             if (_command.ContainsParameter("delayStart"))
             {
                 var delayStartStr = _command.GetFirstParameterValue("delayStart");

Assets/Adjust/Test/3rdParty/JsonNet-Lite.unitypackage.json

@@ -10,6 +10,7 @@ public class AdjustConfig
         internal string sceneName;
         internal string userAgent;
         internal string defaultTracker;
+        internal string externalDeviceId;
         internal long? info1;
         internal long? info2;
         internal long? info3;
@@ -63,6 +64,11 @@ public void setDefaultTracker(string defaultTracker)
             this.defaultTracker = defaultTracker;
         }
 
+        public void setExternalDeviceId(string externalDeviceId)
+        {
+            this.externalDeviceId = externalDeviceId;
+        }
+
         public void setLaunchDeferredDeeplink(bool launchDeferredDeeplink)
         {
             this.launchDeferredDeeplink = launchDeferredDeeplink;

Assets/Adjust/Test/3rdParty/JsonNet-Lite/Newtonsoft.Json.dll

@@ -17,7 +17,7 @@ namespace com.adjust.sdk
 {
     public class AdjustWindows
     {
-        private const string sdkPrefix = "unity4.19.2";
+        private const string sdkPrefix = "unity4.20.0";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)

Assets/Adjust/Test/3rdParty/JsonNet-Lite/Newtonsoft.Json.dll.mdb

@@ -95,6 +95,8 @@
  */
 @property (nonatomic, copy, nullable) NSString *defaultTracker;
 
+@property (nonatomic, copy, nullable) NSString *externalDeviceId;
+
 /**
  * @brief Adjust app token.
  */

Assets/Adjust/Test/CommandExecutor.cs

@@ -2,7 +2,7 @@
 //  Adjust.h
 //  Adjust
 //
-//  V4.19.0
+//  V4.20.0
 //  Created by Christian Wellenbrock (wellle) on 23rd July 2013.
 //  Copyright © 2012-2017 Adjust GmbH. All rights reserved.
 //

Assets/Adjust/Unity/AdjustConfig.cs

@@ -83,6 +83,7 @@ void _AdjustLaunchApp(const char* appToken,
                           const char* sdkPrefix,
                           const char* userAgent,
                           const char* defaultTracker,
+                          const char* externalDeviceId,
                           const char* sceneName,
                           int allowSuppressLogLevel,
                           int logLevel,
@@ -107,6 +108,7 @@ void _AdjustLaunchApp(const char* appToken,
         NSString *stringSdkPrefix = isStringValid(sdkPrefix) == true ? [NSString stringWithUTF8String:sdkPrefix] : nil;
         NSString *stringUserAgent = isStringValid(userAgent) == true ? [NSString stringWithUTF8String:userAgent] : nil;
         NSString *stringDefaultTracker = isStringValid(defaultTracker) == true ? [NSString stringWithUTF8String:defaultTracker] : nil;
+        NSString *stringExternalDeviceId = isStringValid(externalDeviceId) == true ? [NSString stringWithUTF8String:externalDeviceId] : nil;
         NSString *stringSceneName = isStringValid(sceneName) == true ? [NSString stringWithUTF8String:sceneName] : nil;
 
         ADJConfig *adjustConfig;
@@ -176,6 +178,11 @@ void _AdjustLaunchApp(const char* appToken,
             [adjustConfig setDefaultTracker:stringDefaultTracker];
         }
 
+        // External device identifier.
+        if (externalDeviceId != nil) {
+            [adjustConfig setExternalDeviceId:stringExternalDeviceId];
+        }
+
         // App secret.
         if (secretId != -1 && info1 != -1 && info2 != -1 && info3 != -1 && info4 != 1) {
             [adjustConfig setAppSecret:secretId info1:info1 info2:info2 info3:info3 info4:info4];

Assets/Adjust/Windows/AdjustWindows.cs

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.19.2";
+        private const string sdkPrefix = "unity4.20.0";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
@@ -17,6 +17,7 @@ private static extern void _AdjustLaunchApp(
             string sdkPrefix,
             string userAgent,
             string defaultTracker,
+            string extenralDeviceId,
             string sceneName,
             int allowSuppressLogLevel,
             int logLevel,
@@ -135,6 +136,7 @@ public static void Start(AdjustConfig adjustConfig)
             string sceneName = adjustConfig.sceneName != null ? adjustConfig.sceneName : "ADJ_INVALID";
             string userAgent = adjustConfig.userAgent != null ? adjustConfig.userAgent : "ADJ_INVALID";
             string defaultTracker = adjustConfig.defaultTracker != null ? adjustConfig.defaultTracker : "ADJ_INVALID";
+            string externalDeviceId = adjustConfig.externalDeviceId != null ? adjustConfig.externalDeviceId : "ADJ_INVALID";
             string environment = adjustConfig.environment.ToLowercaseString();
             long info1 = AdjustUtils.ConvertLong(adjustConfig.info1);
             long info2 = AdjustUtils.ConvertLong(adjustConfig.info2);
@@ -161,6 +163,7 @@ public static void Start(AdjustConfig adjustConfig)
                 sdkPrefix,
                 userAgent,
                 defaultTracker,
+                externalDeviceId,
                 sceneName,
                 allowSuppressLogLevel,
                 logLevel,

Assets/Adjust/iOS/ADJConfig.h

@@ -1,3 +1,14 @@
+### Version 4.20.0 (16th January 2020)
+#### Added
+- Added external device ID support.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.20.0]
+- [[email protected]][android_sdk_v4.20.0]
+- [[email protected]][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.19.2 (14th January 2020)
 #### Added
 - Added Adjust SDK to Unity Asset Store. As of this version, you can add Adjust SDK from [Unity Asset Store](https://assetstore.unity.com/packages/tools/utilities/adjust-sdk-160890) as well.
@@ -642,6 +653,7 @@
 [ios_sdk_v4.18.0]: https://github.com/adjust/ios_sdk/tree/v4.18.0
 [ios_sdk_v4.18.3]: https://github.com/adjust/ios_sdk/tree/v4.18.3
 [ios_sdk_v4.19.0]: https://github.com/adjust/ios_sdk/tree/v4.19.0
+[ios_sdk_v4.20.0]: https://github.com/adjust/ios_sdk/tree/v4.20.0
 
 [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
@@ -665,6 +677,7 @@
 [android_sdk_v4.18.2]: https://github.com/adjust/android_sdk/tree/v4.18.2
 [android_sdk_v4.19.0]: https://github.com/adjust/android_sdk/tree/v4.19.0
 [android_sdk_v4.19.1]: https://github.com/adjust/android_sdk/tree/v4.19.1
+[android_sdk_v4.20.0]: https://github.com/adjust/android_sdk/tree/v4.20.0
 
 [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

Assets/Adjust/iOS/Adjust.h

@@ -1 +1 @@
-4.19.2
+4.20.0

Assets/Adjust/iOS/AdjustSdk.a

@@ -1,4 +1,4 @@
-## Migrate your Adjust SDK for Unity3d to 4.19.2 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.20.0 from 3.4.4
 
 ### Migration procedure