Merge pull request #195 from adjust/v4231

Version 4.23.1

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.23.0";
+        private const string sdkPrefix = "unity4.23.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");

Assets/Adjust/Android/Test/adjust-test.jar

@@ -14,35 +14,32 @@
 
 public class AdjustEditor : AssetPostprocessor
 {
-    private static bool isPostProcessingEnabled = true;
-    private static String ios14EditorPrefsKey = "adjustiOS14Support";
-
-    [MenuItem("Assets/Adjust/Is iOS 14 Support Enabled?")]
-    public static void IsiOS14SupportEnabled()
+    [MenuItem("Assets/Adjust/Check iOS 14 Support Status")]
+    public static void CheckIOS14SupportStatus()
     {
-        bool isEnabled = EditorPrefs.GetBool(ios14EditorPrefsKey, false);
-        EditorUtility.DisplayDialog("Adjust SDK", "iOS 14 support is " + (isEnabled ? "enabled." : "disabled."), "OK");
+        EditorUtility.DisplayDialog("Adjust SDK", "iOS 14 support is " + (AdjustSettings.IsiOS14ProcessingEnabled ? "enabled." : "disabled."), "OK");
     }
 
-    [MenuItem("Assets/Adjust/Toggle iOS 14 Support")]
-    public static void ToggleiOS14Support()
+    [MenuItem("Assets/Adjust/Toggle iOS 14 Support Status")]
+    public static void ToggleiOS14SupportStatus()
     {
-        bool isEnabled = !EditorPrefs.GetBool(ios14EditorPrefsKey, false);
-        EditorPrefs.SetBool(ios14EditorPrefsKey, isEnabled);
-        EditorUtility.DisplayDialog("Adjust SDK", "iOS 14 support is now " + (isEnabled ? "enabled." : "disabled."), "OK");
+        AdjustSettings.IsiOS14ProcessingEnabled = !AdjustSettings.IsiOS14ProcessingEnabled;
+        EditorUtility.SetDirty(AdjustSettings.Instance);
+        EditorUtility.DisplayDialog("Adjust SDK", "iOS 14 support is now " + (AdjustSettings.IsiOS14ProcessingEnabled ? "enabled." : "disabled."), "OK");
     }
 
-    [MenuItem("Assets/Adjust/Is Post Processing Enabled?")]
-    public static void IsPostProcessingEnabled()
+    [MenuItem("Assets/Adjust/Check Post Processing Status")]
+    public static void CheckPostProcessingStatus()
     {
-        EditorUtility.DisplayDialog("Adjust SDK", "The post processing for Adjust SDK is " + (isPostProcessingEnabled ? "enabled." : "disabled."), "OK");
+        EditorUtility.DisplayDialog("Adjust SDK", "The post processing for Adjust SDK is " + (AdjustSettings.IsPostProcessingEnabled ? "enabled." : "disabled."), "OK");
     }
 
-    [MenuItem("Assets/Adjust/Toggle Post Processing Permission")]
-    public static void TogglePostProcessingPermission()
+    [MenuItem("Assets/Adjust/Toggle Post Processing Status")]
+    public static void TogglePostProcessingStatus()
     {
-        isPostProcessingEnabled = !isPostProcessingEnabled;
-        EditorUtility.DisplayDialog("Adjust SDK", "The post processing for Adjust SDK is now " + (isPostProcessingEnabled ? "enabled." : "disabled."), "OK");
+        AdjustSettings.IsPostProcessingEnabled = !AdjustSettings.IsPostProcessingEnabled;
+        EditorUtility.SetDirty(AdjustSettings.Instance);
+        EditorUtility.DisplayDialog("Adjust SDK", "The post processing for Adjust SDK is now " + (AdjustSettings.IsPostProcessingEnabled ? "enabled." : "disabled."), "OK");
     }
 
     [MenuItem("Assets/Adjust/Export Unity Package")]
@@ -60,6 +57,7 @@ public static void ExportAdjustUnityPackage()
         assetsToExport.Add(assetsPath + "/Android/AdjustAndroidManifest.xml");
 
         assetsToExport.Add(assetsPath + "/Editor/AdjustEditor.cs");
+        assetsToExport.Add(assetsPath + "/Editor/AdjustSettings.cs");
 
         assetsToExport.Add(assetsPath + "/ExampleGUI/ExampleGUI.cs");
         assetsToExport.Add(assetsPath + "/ExampleGUI/ExampleGUI.prefab");
@@ -123,7 +121,7 @@ public static void OnPostprocessBuild(BuildTarget target, string projectPath)
     {
         // Check what is user setting about allowing Adjust SDK to perform post build tasks.
         // If user disabled it, oh well, we won't do a thing.
-        if (!isPostProcessingEnabled)
+        if (!AdjustSettings.IsPostProcessingEnabled)
         {
             UnityEngine.Debug.Log("[Adjust]: You have forbidden the Adjust SDK to perform post processing tasks.");
             UnityEngine.Debug.Log("[Adjust]: Skipping post processing tasks.");
@@ -177,7 +175,7 @@ private static void RunPostBuildScript(BuildTarget target, bool preBuild, string
             xcodeProject.AddFrameworkToProject(xcodeTarget, "CoreTelephony.framework", true);
             UnityEngine.Debug.Log("[Adjust]: CoreTelephony.framework added successfully.");
 
-            if (EditorPrefs.GetBool(ios14EditorPrefsKey, false))
+            if (AdjustSettings.IsiOS14ProcessingEnabled)
             {
                 UnityEngine.Debug.Log("[Adjust]: Xcode project being built with iOS 14 support.");
 
@@ -206,6 +204,11 @@ private static void RunPostBuildScript(BuildTarget target, bool preBuild, string
 
             UnityEngine.Debug.Log("[Adjust]: -ObjC successfully added to other linker flags.");
 
+            if (xcodeProject.ContainsFileByProjectPath("Libraries/Adjust/iOS/AdjustSigSdk.a"))
+            {
+                xcodeProject.AddBuildProperty(xcodeTarget, "OTHER_LDFLAGS", "-force_load $(PROJECT_DIR)/Libraries/Adjust/iOS/AdjustSigSdk.a");
+            }
+
             // Save the changes to Xcode project file.
             xcodeProject.WriteToFile(xcodeProjectPath);
 #endif

Assets/Adjust/Android/adjust-android.jar

@@ -0,0 +1,89 @@
+// Inspired by: https://github.com/facebook/facebook-sdk-for-unity/blob/master/Facebook.Unity.Settings/FacebookSettings.cs
+
+using System;
+using System.IO;
+using UnityEditor;
+using UnityEngine;
+
+public class AdjustSettings : ScriptableObject
+{
+    private static AdjustSettings instance;
+
+    [SerializeField]
+    private bool isPostProcessingEnabled = true;
+    [SerializeField]
+    private bool isiOS14ProcessingEnabled = false;
+
+    public static AdjustSettings Instance
+    {
+        get
+        {
+            instance = NullableInstance;
+
+            if (instance == null)
+            {
+                instance = ScriptableObject.CreateInstance<AdjustSettings>();
+                AssetDatabase.CreateAsset(instance, "Assets/Adjust/Editor/AdjustSettings.asset");
+
+                // Before switching to AssetsDatabase, EditorPrefs were used to write 'adjustiOS14Support' key.
+                // Check if this key still exists in EditorPrefs.
+                // If yes, migrate the value to AdjustSettings.asset and remove the key from EditorPrefs.
+                if (EditorPrefs.HasKey("adjustiOS14Support"))
+                {
+                    UnityEngine.Debug.Log("[Adjust]: Found 'adjustiOS14Support' key in EditorPrefs.");
+                    UnityEngine.Debug.Log("[Adjust]: Migrating that value to AdjustSettings.asset.");
+                    IsiOS14ProcessingEnabled = EditorPrefs.GetBool("adjustiOS14Support", false);
+                    EditorPrefs.DeleteKey("adjustiOS14Support");
+                    UnityEngine.Debug.Log("[Adjust]: Key 'adjustiOS14Support' removed from EditorPrefs.");
+                }
+            }
+
+            return instance;
+        }
+    }
+
+    public static AdjustSettings NullableInstance
+    {
+        get
+        {
+            if (instance == null)
+            {
+                instance = (AdjustSettings)AssetDatabase.LoadAssetAtPath("Assets/Adjust/Editor/AdjustSettings.asset", typeof(AdjustSettings));
+            }
+
+            return instance;
+        }
+    }
+
+    public static bool IsPostProcessingEnabled
+    {
+        get
+        {
+            return Instance.isPostProcessingEnabled;
+        }
+
+        set
+        {
+            if (Instance.isPostProcessingEnabled != value)
+            {
+                Instance.isPostProcessingEnabled = value;
+            }
+        }
+    }
+
+    public static bool IsiOS14ProcessingEnabled
+    {
+        get
+        {
+            return Instance.isiOS14ProcessingEnabled;
+        }
+
+        set
+        {
+            if (Instance.isiOS14ProcessingEnabled != value)
+            {
+                Instance.isiOS14ProcessingEnabled = value;
+            }
+        }
+    }
+}

Assets/Adjust/Editor/AdjustEditor.cs

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

Assets/Adjust/Editor/AdjustSettings.cs

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

Assets/Adjust/Editor/AdjustSettings.cs.meta

@@ -8,7 +8,7 @@ namespace com.adjust.sdk
 #if UNITY_IOS
     public class AdjustiOS
     {
-        private const string sdkPrefix = "unity4.23.0";
+        private const string sdkPrefix = "unity4.23.1";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(

Assets/Adjust/Windows/AdjustWindows.cs

@@ -1,3 +1,17 @@
+### Version 4.23.1 (29th August 2020)
+#### Fixed
+- Fixed duplicate `ADJUrlStrategy` symbol error.
+
+#### Changed
+- Switched to usage of `AssetDatabase` instead of `EditorPrefs` to store relevant information from `AdjustEditor`.
+
+#### Native SDKs
+- [[email protected]][ios_sdk_v4.23.2]
+- [[email protected]][android_sdk_v4.24.1]
+- [[email protected]][windows_sdk_v4.17.0]
+
+---
+
 ### Version 4.23.0 (21st August 2020)
 #### Added
 - Added communication with SKAdNetwork framework by default on iOS 14.
@@ -765,6 +779,7 @@
 [ios_sdk_v4.22.0]: https://github.com/adjust/ios_sdk/tree/v4.22.0
 [ios_sdk_v4.22.1]: https://github.com/adjust/ios_sdk/tree/v4.22.1
 [ios_sdk_v4.23.0]: https://github.com/adjust/ios_sdk/tree/v4.23.0
+[ios_sdk_v4.23.2]: https://github.com/adjust/ios_sdk/tree/v4.23.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
@@ -793,6 +808,7 @@
 [android_sdk_v4.21.1]: https://github.com/adjust/android_sdk/tree/v4.21.1
 [android_sdk_v4.22.0]: https://github.com/adjust/android_sdk/tree/v4.22.0
 [android_sdk_v4.24.0]: https://github.com/adjust/android_sdk/tree/v4.24.0
+[android_sdk_v4.24.1]: https://github.com/adjust/android_sdk/tree/v4.24.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

Assets/Adjust/iOS/Adjust.h

@@ -1 +1 @@
-4.23.0
+4.23.1

Assets/Adjust/iOS/AdjustSdk.a

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