Merge pull request #197 from adjust/v4232

Version 4.23.2
adjust · Oct 2, 2020 · 71833d9 · 71833d9
2 parents ff24707 + 0751cb3
commit 71833d9
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 10 deletions.
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.23.1";
+        private const string sdkPrefix = "unity4.23.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/Editor/AdjustEditor.cs b/Assets/Adjust/Editor/AdjustEditor.cs
@@ -25,7 +25,8 @@ public static void ToggleiOS14SupportStatus()
     {
         AdjustSettings.IsiOS14ProcessingEnabled = !AdjustSettings.IsiOS14ProcessingEnabled;
         EditorUtility.SetDirty(AdjustSettings.Instance);
-        EditorUtility.DisplayDialog("Adjust SDK", "iOS 14 support is now " + (AdjustSettings.IsiOS14ProcessingEnabled ? "enabled." : "disabled."), "OK");
+        EditorUtility.DisplayDialog("Adjust SDK", "iOS 14 support is now " + (AdjustSettings.IsiOS14ProcessingEnabled ? "enabled." : "disabled.") +
+            "\nNote: Make sure to save your project files in order for this change to take effect.", "OK");
     }
 
     [MenuItem("Assets/Adjust/Check Post Processing Status")]
@@ -39,7 +40,8 @@ public static void TogglePostProcessingStatus()
     {
         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");
+        EditorUtility.DisplayDialog("Adjust SDK", "The post processing for Adjust SDK is now " + (AdjustSettings.IsPostProcessingEnabled ? "enabled." : "disabled.") +
+            "\nNote: Make sure to save your project files in order for this change to take effect.", "OK");
     }
 
     [MenuItem("Assets/Adjust/Export Unity Package")]

diff --git a/Assets/Adjust/Editor/AdjustSettings.cs b/Assets/Adjust/Editor/AdjustSettings.cs
@@ -22,8 +22,15 @@ public static AdjustSettings Instance
 
             if (instance == null)
             {
+                // Create AdjustSettings.asset inside the folder in which AdjustSettings.cs reside.
                 instance = ScriptableObject.CreateInstance<AdjustSettings>();
-                AssetDatabase.CreateAsset(instance, "Assets/Adjust/Editor/AdjustSettings.asset");
+                var guids = AssetDatabase.FindAssets(string.Format("{0} t:script", "AdjustSettings"));
+                if (guids == null || guids.Length <= 0)
+                {
+                    return instance;
+                }
+                var assetPath = AssetDatabase.GUIDToAssetPath(guids[0]).Replace("AdjustSettings.cs", "AdjustSettings.asset");
+                AssetDatabase.CreateAsset(instance, assetPath);
 
                 // Before switching to AssetsDatabase, EditorPrefs were used to write 'adjustiOS14Support' key.
                 // Check if this key still exists in EditorPrefs.
@@ -48,7 +55,13 @@ public static AdjustSettings NullableInstance
         {
             if (instance == null)
             {
-                instance = (AdjustSettings)AssetDatabase.LoadAssetAtPath("Assets/Adjust/Editor/AdjustSettings.asset", typeof(AdjustSettings));
+                var guids = AssetDatabase.FindAssets(string.Format("{0} t:ScriptableObject", "AdjustSettings"));
+                if (guids == null || guids.Length <= 0)
+                {
+                    return instance;
+                }
+                var assetPath = AssetDatabase.GUIDToAssetPath(guids[0]);
+                instance = (AdjustSettings)AssetDatabase.LoadAssetAtPath(assetPath, typeof(AdjustSettings));
             }
 
             return instance;

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.23.1";
+        private const string sdkPrefix = "unity4.23.2";
         private static bool appLaunched = false;
 
         public static void Start(AdjustConfig adjustConfig)

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.23.1";
+        private const string sdkPrefix = "unity4.23.2";
 
         [DllImport("__Internal")]
         private static extern void _AdjustLaunchApp(

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,18 @@
-### Version 4.23.1 (29th August 2020)
+### Version 4.23.2 (2nd October 2020)
+#### Added
+- Added note to `Assets/Adjust` menu toggling actions that project needs to be saved in order for actions to take effect.
+
+#### Changed
+- Switched to usage of relative paths when working with `AdjustSettings.asset` file.
+
+#### 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.1 (29th September 2020)
 #### Fixed
 - Fixed duplicate `ADJUrlStrategy` symbol error.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-4.23.1
+4.23.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.23.1 from 3.4.4
+## Migrate your Adjust SDK for Unity3d to 4.23.2 from 3.4.4
 
 ### Migration procedure