Merge pull request #146 from adjust/v4172

Srđan Tubin · web-flow · commit b5733fb0b647 · 2019-03-29T18:38:05.000+01:00
Version 4.17.2
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.17.1";
+        private const string sdkPrefix = "unity4.17.2";
         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");
diff --git a/Assets/Adjust/Unity/AdjustUtils.cs b/Assets/Adjust/Unity/AdjustUtils.cs
@@ -240,43 +240,43 @@ public static AndroidJavaObject TestOptionsMap2AndroidJavaObject(Dictionary<stri
             }
             if (testOptionsMap.ContainsKey(KeyTestOptionsUseTestConnectionOptions)) 
             {
-                bool useTestConnectionOptions = testOptionsMap [KeyTestOptionsUseTestConnectionOptions].ToLower () == "true";
+                bool useTestConnectionOptions = testOptionsMap[KeyTestOptionsUseTestConnectionOptions].ToLower() == "true";
                 AndroidJavaObject ajoUseTestConnectionOptions = new AndroidJavaObject("java.lang.Boolean", useTestConnectionOptions);
                 ajoTestOptions.Set<AndroidJavaObject>("useTestConnectionOptions", ajoUseTestConnectionOptions);
             }
             if (testOptionsMap.ContainsKey(KeyTestOptionsTimerIntervalInMilliseconds)) 
             {
-                var timerIntervalInMilliseconds = long.Parse (testOptionsMap [KeyTestOptionsTimerIntervalInMilliseconds]);
+                var timerIntervalInMilliseconds = long.Parse(testOptionsMap[KeyTestOptionsTimerIntervalInMilliseconds]);
                 AndroidJavaObject ajoTimerIntervalInMilliseconds = new AndroidJavaObject("java.lang.Long", timerIntervalInMilliseconds);
                 ajoTestOptions.Set<AndroidJavaObject>("timerIntervalInMilliseconds", ajoTimerIntervalInMilliseconds);
             }
             if (testOptionsMap.ContainsKey(KeyTestOptionsTimerStartInMilliseconds)) 
             {
-                var timerStartInMilliseconds = long.Parse (testOptionsMap [KeyTestOptionsTimerStartInMilliseconds]);
+                var timerStartInMilliseconds = long.Parse(testOptionsMap[KeyTestOptionsTimerStartInMilliseconds]);
                 AndroidJavaObject ajoTimerStartInMilliseconds = new AndroidJavaObject("java.lang.Long", timerStartInMilliseconds);
                 ajoTestOptions.Set<AndroidJavaObject>("timerStartInMilliseconds", ajoTimerStartInMilliseconds);
             }
             if (testOptionsMap.ContainsKey(KeyTestOptionsSessionIntervalInMilliseconds)) 
             {   
-                var sessionIntervalInMilliseconds = long.Parse (testOptionsMap [KeyTestOptionsSessionIntervalInMilliseconds]);
+                var sessionIntervalInMilliseconds = long.Parse(testOptionsMap[KeyTestOptionsSessionIntervalInMilliseconds]);
                 AndroidJavaObject ajoSessionIntervalInMilliseconds = new AndroidJavaObject("java.lang.Long", sessionIntervalInMilliseconds);
                 ajoTestOptions.Set<AndroidJavaObject>("sessionIntervalInMilliseconds", ajoSessionIntervalInMilliseconds);
             }
             if (testOptionsMap.ContainsKey(KeyTestOptionsSubsessionIntervalInMilliseconds)) 
             {
-                var subsessionIntervalInMilliseconds = long.Parse (testOptionsMap [KeyTestOptionsSubsessionIntervalInMilliseconds]);
+                var subsessionIntervalInMilliseconds = long.Parse(testOptionsMap[KeyTestOptionsSubsessionIntervalInMilliseconds]);
                 AndroidJavaObject ajoSubsessionIntervalInMilliseconds = new AndroidJavaObject("java.lang.Long", subsessionIntervalInMilliseconds);
                 ajoTestOptions.Set<AndroidJavaObject>("subsessionIntervalInMilliseconds", ajoSubsessionIntervalInMilliseconds);
             }
             if (testOptionsMap.ContainsKey(KeyTestOptionsTeardown))
             {
-                bool teardown = testOptionsMap [KeyTestOptionsTeardown].ToLower () == "true";
+                bool teardown = testOptionsMap[KeyTestOptionsTeardown].ToLower() == "true";
                 AndroidJavaObject ajoTeardown = new AndroidJavaObject("java.lang.Boolean", teardown);
                 ajoTestOptions.Set<AndroidJavaObject>("teardown", ajoTeardown);
             }
             if (testOptionsMap.ContainsKey(KeyTestOptionsNoBackoffWait))
             {
-                bool noBackoffWait = testOptionsMap [KeyTestOptionsNoBackoffWait].ToLower () == "true";
+                bool noBackoffWait = testOptionsMap[KeyTestOptionsNoBackoffWait].ToLower() == "true";
                 AndroidJavaObject ajoNoBackoffWait = new AndroidJavaObject("java.lang.Boolean", noBackoffWait);
                 ajoTestOptions.Set<AndroidJavaObject>("noBackoffWait", ajoNoBackoffWait);
             }
diff --git a/Assets/Adjust/Windows/AdjustWindows.cs b/Assets/Adjust/Windows/AdjustWindows.cs
@@ -2,6 +2,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Reflection;
 using UnityEngine;
 
 #if UNITY_WSA_10_0
@@ -16,7 +17,7 @@ namespace com.adjust.sdk
 {
     public class AdjustWindows
     {
-        private const string sdkPrefix = "unity4.17.1";
+        private const string sdkPrefix = "unity4.17.2";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)
@@ -270,50 +271,69 @@ public static void SetTestOptions(Dictionary<string, string> testOptions)
             bool deleteState = false;
             bool noBackoffWait = false;
 
-            if (testOptions.ContainsKey (AdjustUtils.KeyTestOptionsTimerIntervalInMilliseconds)) 
+            if (testOptions.ContainsKey(AdjustUtils.KeyTestOptionsTimerIntervalInMilliseconds))
             {
-                timerIntervalMls = long.Parse (testOptions [AdjustUtils.KeyTestOptionsTimerIntervalInMilliseconds]);
+                timerIntervalMls = long.Parse(testOptions[AdjustUtils.KeyTestOptionsTimerIntervalInMilliseconds]);
             }
-            if (testOptions.ContainsKey (AdjustUtils.KeyTestOptionsTimerStartInMilliseconds)) 
+            if (testOptions.ContainsKey(AdjustUtils.KeyTestOptionsTimerStartInMilliseconds))
             {
-                timerStartMls = long.Parse (testOptions [AdjustUtils.KeyTestOptionsTimerStartInMilliseconds]);
+                timerStartMls = long.Parse(testOptions[AdjustUtils.KeyTestOptionsTimerStartInMilliseconds]);
             }
-            if (testOptions.ContainsKey (AdjustUtils.KeyTestOptionsSessionIntervalInMilliseconds))
+            if (testOptions.ContainsKey(AdjustUtils.KeyTestOptionsSessionIntervalInMilliseconds))
             {
-                sessionIntMls = long.Parse (testOptions [AdjustUtils.KeyTestOptionsSessionIntervalInMilliseconds]);
+                sessionIntMls = long.Parse(testOptions[AdjustUtils.KeyTestOptionsSessionIntervalInMilliseconds]);
             }
-            if (testOptions.ContainsKey (AdjustUtils.KeyTestOptionsSubsessionIntervalInMilliseconds))
+            if (testOptions.ContainsKey(AdjustUtils.KeyTestOptionsSubsessionIntervalInMilliseconds))
             {
-                subsessionIntMls = long.Parse (testOptions [AdjustUtils.KeyTestOptionsSubsessionIntervalInMilliseconds]);
+                subsessionIntMls = long.Parse(testOptions[AdjustUtils.KeyTestOptionsSubsessionIntervalInMilliseconds]);
             }
-            if (testOptions.ContainsKey (AdjustUtils.KeyTestOptionsTeardown))
+            if (testOptions.ContainsKey(AdjustUtils.KeyTestOptionsTeardown))
             {
-                teardown = testOptions [AdjustUtils.KeyTestOptionsTeardown].ToLower() == "true";
+                teardown = testOptions[AdjustUtils.KeyTestOptionsTeardown].ToLower() == "true";
             }
-            if (testOptions.ContainsKey (AdjustUtils.KeyTestOptionsDeleteState))
+            if (testOptions.ContainsKey(AdjustUtils.KeyTestOptionsDeleteState))
             {
-                deleteState = testOptions [AdjustUtils.KeyTestOptionsDeleteState].ToLower() == "true";
+                deleteState = testOptions[AdjustUtils.KeyTestOptionsDeleteState].ToLower() == "true";
             }
-            if (testOptions.ContainsKey (AdjustUtils.KeyTestOptionsNoBackoffWait))
+            if (testOptions.ContainsKey(AdjustUtils.KeyTestOptionsNoBackoffWait))
             {
-                noBackoffWait = testOptions [AdjustUtils.KeyTestOptionsNoBackoffWait].ToLower() == "true";
+                noBackoffWait = testOptions[AdjustUtils.KeyTestOptionsNoBackoffWait].ToLower() == "true";
             }
 
-            TestLibraryInterface.TestLibraryInterface.SetTestOptions(
-                new TestLibraryInterface.AdjustTestOptionsDto
-                {
-                    BaseUrl = testOptions[AdjustUtils.KeyTestOptionsBaseUrl],
-                    GdprUrl = testOptions[AdjustUtils.KeyTestOptionsGdprUrl],
-                    BasePath = basePath,
-                    GdprPath = gdprPath,
-                    SessionIntervalInMilliseconds = sessionIntMls,
-                    SubsessionIntervalInMilliseconds = subsessionIntMls,
-                    TimerIntervalInMilliseconds = timerIntervalMls,
-                    TimerStartInMilliseconds = timerStartMls,
-                    DeleteState = deleteState,
-                    Teardown = teardown,
-                    NoBackoffWait = noBackoffWait
-                });
+            Type testLibInterfaceType = Type.GetType("TestLibraryInterface.TestLibraryInterface, TestLibraryInterface");
+            Type adjustTestOptionsDtoType = Type.GetType("TestLibraryInterface.AdjustTestOptionsDto, TestLibraryInterface");
+            if (testLibInterfaceType == null || adjustTestOptionsDtoType == null)
+            {
+                return;
+            }
+
+            PropertyInfo baseUrlInfo = adjustTestOptionsDtoType.GetProperty("BaseUrl");
+            PropertyInfo gdprUrlInfo = adjustTestOptionsDtoType.GetProperty("GdprUrl");
+            PropertyInfo basePathInfo = adjustTestOptionsDtoType.GetProperty("BasePath");
+            PropertyInfo gdprPathInfo = adjustTestOptionsDtoType.GetProperty("GdprPath");
+            PropertyInfo sessionIntervalInMillisecondsInfo = adjustTestOptionsDtoType.GetProperty("SessionIntervalInMilliseconds");
+            PropertyInfo subsessionIntervalInMillisecondsInfo = adjustTestOptionsDtoType.GetProperty("SubsessionIntervalInMilliseconds");
+            PropertyInfo timerIntervalInMillisecondsInfo = adjustTestOptionsDtoType.GetProperty("TimerIntervalInMilliseconds");
+            PropertyInfo timerStartInMillisecondsInfo = adjustTestOptionsDtoType.GetProperty("TimerStartInMilliseconds");
+            PropertyInfo deleteStateInfo = adjustTestOptionsDtoType.GetProperty("DeleteState");
+            PropertyInfo teardownInfo = adjustTestOptionsDtoType.GetProperty("Teardown");
+            PropertyInfo noBackoffWaitInfo = adjustTestOptionsDtoType.GetProperty("NoBackoffWait");
+
+            object adjustTestOptionsDtoInstance = Activator.CreateInstance(adjustTestOptionsDtoType);
+            baseUrlInfo.SetValue(adjustTestOptionsDtoInstance, testOptions[AdjustUtils.KeyTestOptionsBaseUrl], null);
+            gdprUrlInfo.SetValue(adjustTestOptionsDtoInstance, testOptions[AdjustUtils.KeyTestOptionsGdprUrl], null);
+            basePathInfo.SetValue(adjustTestOptionsDtoInstance, basePath, null);
+            gdprPathInfo.SetValue(adjustTestOptionsDtoInstance, gdprPath, null);
+            sessionIntervalInMillisecondsInfo.SetValue(adjustTestOptionsDtoInstance, sessionIntMls, null);
+            subsessionIntervalInMillisecondsInfo.SetValue(adjustTestOptionsDtoInstance, subsessionIntMls, null);
+            timerIntervalInMillisecondsInfo.SetValue(adjustTestOptionsDtoInstance, timerIntervalMls, null);
+            timerStartInMillisecondsInfo.SetValue(adjustTestOptionsDtoInstance, timerStartMls, null);
+            deleteStateInfo.SetValue(adjustTestOptionsDtoInstance, deleteState, null);
+            teardownInfo.SetValue(adjustTestOptionsDtoInstance, teardown, null);
+            noBackoffWaitInfo.SetValue(adjustTestOptionsDtoInstance, noBackoffWait, null);
+
+            MethodInfo setTestOptionsMethodInfo = testLibInterfaceType.GetMethod("SetTestOptions");
+            setTestOptionsMethodInfo.Invoke(null, new object[] { adjustTestOptionsDtoInstance });
         }
     }
 }
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.17.1";
+        private const string sdkPrefix = "unity4.17.2";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(
diff --git a/Assets/Editor/AdjustEditor.cs b/Assets/Editor/AdjustEditor.cs
@@ -90,6 +90,7 @@ static void ExportAdjustUnityPackage()
         assetsToExport.Add(assetsPath + "/Windows/WS/WinWsInterface.dll");
         assetsToExport.Add(assetsPath + "/Windows/WU10/AdjustUAP10.dll");
         assetsToExport.Add(assetsPath + "/Windows/WU10/Win10Interface.dll");
+        assetsToExport.Add(assetsPath + "/Windows/Newtonsoft.Json.dll");
 
         AssetDatabase.ExportPackage(
             assetsToExport.ToArray(),
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+### Version 4.17.2 (29th March 2019)
+#### Fixed
+- Fixed bug in `AdjustWindows.cs` which prevented the project to be built for Universal Windows Platform.
+
+#### Native SDKs
+- [iOS@v4.17.2][ios_sdk_v4.17.2]
+- [Android@v4.17.0][android_sdk_v4.17.0]
+- [Windows@v4.17.0][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.17.1 (21st March 2019)
 #### Fixed
 - Fixed bug in `AdjustEditor.cs` which would add multiple instance of Adjust broadcast receiver to `AndroidManifest.xml` (https://github.com/adjust/unity_sdk/issues/144).
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.17.1
+4.17.2
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.17.1 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.17.2 from 3.4.4
 
 ### Migration procedure
 
@@ -9,7 +9,7 @@ keeping in `Assets/Plugins` folder.
 
 For migration purposes, we have prepared the Adjust SDK uninstall script written in Python (`adjust_uninstall.py`).
 
-Migration to version 4.17.1 of our SDK requires the following steps:
+Migration to version 4.17.2 of our SDK requires the following steps:
 
 1. Copy the `adjust_uninstall.py` script to your root Unity project directory and run it. This script should
 delete all adjust source files from the previous SDK version you had.

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.17.1";`
	`11`	`+ private const string sdkPrefix = "unity4.17.2";`
`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");`
Original file line number	Diff line number	Diff line change
`@@ -240,43 +240,43 @@ public static AndroidJavaObject TestOptionsMap2AndroidJavaObject(Dictionary<stri`
`240`	`240`	`}`
`241`	`241`	`if (testOptionsMap.ContainsKey(KeyTestOptionsUseTestConnectionOptions))`
`242`	`242`	`{`
`243`		`- bool useTestConnectionOptions = testOptionsMap [KeyTestOptionsUseTestConnectionOptions].ToLower () == "true";`
	`243`	`+ bool useTestConnectionOptions = testOptionsMap[KeyTestOptionsUseTestConnectionOptions].ToLower() == "true";`
`244`	`244`	`AndroidJavaObject ajoUseTestConnectionOptions = new AndroidJavaObject("java.lang.Boolean", useTestConnectionOptions);`
`245`	`245`	`ajoTestOptions.Set<AndroidJavaObject>("useTestConnectionOptions", ajoUseTestConnectionOptions);`
`246`	`246`	`}`
`247`	`247`	`if (testOptionsMap.ContainsKey(KeyTestOptionsTimerIntervalInMilliseconds))`
`248`	`248`	`{`
`249`		`- var timerIntervalInMilliseconds = long.Parse (testOptionsMap [KeyTestOptionsTimerIntervalInMilliseconds]);`
	`249`	`+ var timerIntervalInMilliseconds = long.Parse(testOptionsMap[KeyTestOptionsTimerIntervalInMilliseconds]);`
`250`	`250`	`AndroidJavaObject ajoTimerIntervalInMilliseconds = new AndroidJavaObject("java.lang.Long", timerIntervalInMilliseconds);`
`251`	`251`	`ajoTestOptions.Set<AndroidJavaObject>("timerIntervalInMilliseconds", ajoTimerIntervalInMilliseconds);`
`252`	`252`	`}`
`253`	`253`	`if (testOptionsMap.ContainsKey(KeyTestOptionsTimerStartInMilliseconds))`
`254`	`254`	`{`
`255`		`- var timerStartInMilliseconds = long.Parse (testOptionsMap [KeyTestOptionsTimerStartInMilliseconds]);`
	`255`	`+ var timerStartInMilliseconds = long.Parse(testOptionsMap[KeyTestOptionsTimerStartInMilliseconds]);`
`256`	`256`	`AndroidJavaObject ajoTimerStartInMilliseconds = new AndroidJavaObject("java.lang.Long", timerStartInMilliseconds);`
`257`	`257`	`ajoTestOptions.Set<AndroidJavaObject>("timerStartInMilliseconds", ajoTimerStartInMilliseconds);`
`258`	`258`	`}`
`259`	`259`	`if (testOptionsMap.ContainsKey(KeyTestOptionsSessionIntervalInMilliseconds))`
`260`	`260`	`{`
`261`		`- var sessionIntervalInMilliseconds = long.Parse (testOptionsMap [KeyTestOptionsSessionIntervalInMilliseconds]);`
	`261`	`+ var sessionIntervalInMilliseconds = long.Parse(testOptionsMap[KeyTestOptionsSessionIntervalInMilliseconds]);`
`262`	`262`	`AndroidJavaObject ajoSessionIntervalInMilliseconds = new AndroidJavaObject("java.lang.Long", sessionIntervalInMilliseconds);`
`263`	`263`	`ajoTestOptions.Set<AndroidJavaObject>("sessionIntervalInMilliseconds", ajoSessionIntervalInMilliseconds);`
`264`	`264`	`}`
`265`	`265`	`if (testOptionsMap.ContainsKey(KeyTestOptionsSubsessionIntervalInMilliseconds))`
`266`	`266`	`{`
`267`		`- var subsessionIntervalInMilliseconds = long.Parse (testOptionsMap [KeyTestOptionsSubsessionIntervalInMilliseconds]);`
	`267`	`+ var subsessionIntervalInMilliseconds = long.Parse(testOptionsMap[KeyTestOptionsSubsessionIntervalInMilliseconds]);`
`268`	`268`	`AndroidJavaObject ajoSubsessionIntervalInMilliseconds = new AndroidJavaObject("java.lang.Long", subsessionIntervalInMilliseconds);`
`269`	`269`	`ajoTestOptions.Set<AndroidJavaObject>("subsessionIntervalInMilliseconds", ajoSubsessionIntervalInMilliseconds);`
`270`	`270`	`}`
`271`	`271`	`if (testOptionsMap.ContainsKey(KeyTestOptionsTeardown))`
`272`	`272`	`{`
`273`		`- bool teardown = testOptionsMap [KeyTestOptionsTeardown].ToLower () == "true";`
	`273`	`+ bool teardown = testOptionsMap[KeyTestOptionsTeardown].ToLower() == "true";`
`274`	`274`	`AndroidJavaObject ajoTeardown = new AndroidJavaObject("java.lang.Boolean", teardown);`
`275`	`275`	`ajoTestOptions.Set<AndroidJavaObject>("teardown", ajoTeardown);`
`276`	`276`	`}`
`277`	`277`	`if (testOptionsMap.ContainsKey(KeyTestOptionsNoBackoffWait))`
`278`	`278`	`{`
`279`		`- bool noBackoffWait = testOptionsMap [KeyTestOptionsNoBackoffWait].ToLower () == "true";`
	`279`	`+ bool noBackoffWait = testOptionsMap[KeyTestOptionsNoBackoffWait].ToLower() == "true";`
`280`	`280`	`AndroidJavaObject ajoNoBackoffWait = new AndroidJavaObject("java.lang.Boolean", noBackoffWait);`
`281`	`281`	`ajoTestOptions.Set<AndroidJavaObject>("noBackoffWait", ajoNoBackoffWait);`
`282`	`282`	`}`
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.17.1";`
	`11`	`+ private const string sdkPrefix = "unity4.17.2";`
`12`	`12`
`13`	`13`	`[DllImport("__Internal")]`
`14`	`14`	`private static extern void _AdjustLaunchApp(`