com.amanotes.gdk 0.2.52 → 0.2.53

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.2.53 - 2024-03-14]
+- Add FirebaseCrashlyticsHook
+- Fix Change to dev mode
+- Public analytics config
+- Update SDK version tracking
+- Update GDKLocalBuild
+
 ## [0.2.52 - 2024-02-27]
 - Change post processing order
 - Remove GDKInstaller after installed

package/Editor/AmaGDKEditor.cs

@@ -180,7 +180,7 @@ namespace Amanotes.Editor
             {
                 if (GUILayout.Button(ObjectNames.NicifyVariableName(extra)))
                 {
-                    var package = $"{Res.PACKAGE_PATH}{extra}";
+                    var package = $"{Res.EXTRA_PATH}{extra}";
                     AssetDatabase.ImportPackage(package, false);
                 }
             }
@@ -393,10 +393,14 @@ namespace Amanotes.Editor
                 {
                     string adapterName = FindBestAdapterFor(adapterId);
                     var package = $"{Res.PACKAGE_PATH}{adapterName}";
-                    if (GUILayout.Button(GetGUIContent($"Import {adapterId} Adapter"), GUILayout.Height(24f)))
+                    EditorGUI.BeginDisabledGroup(!status.sdkInstalled);
                     {
-                        AssetDatabase.ImportPackage(package, false);
+                        if (GUILayout.Button(GetGUIContent($"Import {adapterId} Adapter"), GUILayout.Height(24f)))
+                        {
+                            AssetDatabase.ImportPackage(package, false);
+                        }    
                     }
+                    EditorGUI.EndDisabledGroup();
                 }
 
             }, () =>
@@ -412,7 +416,7 @@ namespace Amanotes.Editor
                     Color c = GUI.color;
                     GUI.color = Color.yellow;
                     
-                    float w = EditorStyles.label.CalcSize(label).x;
+                    float w = EditorStyles.label.CalcSize(label).x+5f;
                     GUILayout.Label(label, GUILayout.Width(w));
                     GUI.color = c;
                 }

package/Editor/Extra/GDKCIBuildCommand.cs

@@ -2,6 +2,9 @@ using UnityEditor;
 using System.Linq;
 using System;
 using System.IO;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEngine;
 
 namespace Amanotes.Core
 {
@@ -148,7 +151,7 @@ namespace Amanotes.Core
             return true;
         }
 
-        static bool TryGetEnv(string key, out string value)
+        internal static bool TryGetEnv(string key, out string value)
         {
             value = Environment.GetEnvironmentVariable(key);
             return !string.IsNullOrEmpty(value);
@@ -309,4 +312,43 @@ namespace Amanotes.Core
             PlayerSettings.Android.keyaliasPass = keystoreAliasPass;
         }
     }
+    
+    public class GDKPreProcessBuild: IPreprocessBuildWithReport
+    {
+    #if UNITY_2022_1_OR_NEWER
+        private static readonly string GRADLE_VERSION = "7.6.1";
+    #else
+        private static readonly string GRADLE_VERSION = "6.7.1";
+    #endif
+        private static readonly string GRADLE_ROOT = "/usr/local/gradle";
+        
+        public int callbackOrder
+        {
+            get { return 0; }
+        }
+        public void OnPreprocessBuild(BuildReport report)
+        {
+            if (report.summary.platform == BuildTarget.Android)
+            {
+                // Change Gradle path when running in headless mode (CI Machine)
+                if (Application.isBatchMode)
+                {   
+                    EditorPrefs.SetBool("GradleUseEmbedded", false);
+                    
+                    if (GDKCIBuildCommand.TryGetEnv("GRADLE_PATH", out string envGradlePath))
+                    {   
+                        EditorPrefs.SetString("GradlePath", envGradlePath);
+                        Debug.Log("Update gradle path to: " + envGradlePath);
+                    }
+                    else
+                    {
+                        string gradlePath = GRADLE_ROOT + "/gradle-" + GRADLE_VERSION;
+                        EditorPrefs.SetString("GradlePath", gradlePath);
+                        Debug.Log("Update gradle path to: " + gradlePath);
+                    }
+                }
+            }
+            
+        }
+    }
 }

package/Editor/Extra/GDKLocalBuild.cs

@@ -350,8 +350,8 @@ namespace Amanotes.Editor
                 {
                     PlayerSettings.Android.bundleVersionCode = buildNumber;
                     PlayerSettings.Android.buildApkPerCpuArchitecture = splitAPK;
-                    PlayerSettings.Android.targetArchitectures = AndroidArchitecture.All;
-
+                    PlayerSettings.Android.targetArchitectures = AndroidArchitecture.ARM64 | AndroidArchitecture.ARMv7;
+                    
                     EditorUserBuildSettings.buildAppBundle = isAAB;
                     EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
                     
@@ -817,6 +817,7 @@ namespace Amanotes.Editor
                 {
                     ab.buildRQ = GDKLocalBuild.BuildRequestTS.Generate(); //ab.runGitPostBuild
                     ab.ProcessBuild();
+                    GUIUtility.ExitGUI();
                 }
 
                 if (GUILayout.Button("Stop")) ab.StopBuild();

package/Editor/Extra/GDKProjectCP.cs

@@ -1,3 +1,4 @@
+using Amanotes.Core.Internal;
 using System.Collections.Generic;
 using UnityEditor;
 using UnityEngine;
@@ -149,10 +150,67 @@ namespace Amanotes
 			if (productNameStyle == null) Init();
 
 			DrawProjectInfo();
+
+			if (EditorApplication.isPlayingOrWillChangePlaymode)
+			{
+				// EditorGUILayout.HelpBox("Application is Playing!", MessageType.Info);
+				DrawRuntimeGUI();
+				return;
+			}
+			
 			EditorGUILayout.Space();
 			DrawBigPlayButton();
 			EditorGUILayout.Space();
 			DrawListScenes();
 		}
+
+
+		private readonly List<float> FPS = new List<float>()
+		{
+			0, 1, 5, 10, 15, 20, 30, 45, 50, 60, 75, 90, 120, 240, 360, 480, 720, 960, 1000, 1200
+		};
+		
+		private readonly List<float> TIMESCALES = new List<float>()
+		{
+			0f, 0.1f, 0.2f, 0.5f, 1f, 2f, 5f, 10f
+		};
+		
+		void DrawRuntimeGUI()
+		{
+			float fps = Application.targetFrameRate;
+			if (DrawSlider2("Target FPS", ref fps, FPS))
+			{
+				Application.targetFrameRate = (int)fps;
+			}
+			
+			float ts = Time.timeScale;
+			if (DrawSlider2("Time Scale", ref ts, TIMESCALES))
+			{
+				Time.timeScale = ts;
+			}
+		}
+		
+		bool DrawSlider2(string label, ref float v, List<float> values)
+		{
+			int idx1 = values.IndexOf(v);
+			if (idx1 == -1)
+			{
+				values.Add(v);
+				values.Sort();
+				idx1 = values.IndexOf(v);
+			}
+
+			int idx2;
+			GUILayout.BeginHorizontal();
+			{
+				GUILayout.Label(label, GUILayout.Width(100f));
+				idx2 = Mathf.RoundToInt(GUILayout.HorizontalSlider(idx1, 0, values.Count - 1));
+				GUILayout.Label($"{v}", GUILayout.Width(50f));
+			}
+			GUILayout.EndHorizontal();
+			if (idx2 == idx1) return false;
+			v = values[idx2];
+			return true;
+		}
 	}
 }

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -5,6 +5,11 @@ using System.Linq;
 using System.Reflection;
 using System.Xml;
 using Amanotes.Core.Internal;
+#if !UNITY_2021_1_OR_NEWER
+using UnityEditor;
+using UnityEditor.PackageManager;
+using UnityEditor.PackageManager.Requests;
+#endif
 using UnityEngine;
 using static Amanotes.Core.AmaGDK.AdapterID;
 
@@ -66,9 +71,38 @@ namespace Amanotes.Editor
             return result;
         }
     }
-
+    
     internal static class ExtractVersion
     {
+#if !UNITY_2021_1_OR_NEWER
+        static ListRequest listRequest;
+        const string LIST_REQUEST_KEY = "ListRequestData";
+        
+        [InitializeOnLoadMethod]
+        static void Initialize()
+        {
+            Events.registeredPackages += RegisteredPackages;
+            GetRequestList();
+        }
+
+        private static void RegisteredPackages(PackageRegistrationEventArgs obj)
+        {
+            PlayerPrefs.DeleteKey(LIST_REQUEST_KEY);
+            GetRequestList();
+        }
+
+        static void GetRequestList()
+        {
+            if (PlayerPrefs.HasKey(LIST_REQUEST_KEY))
+            {
+                listRequest = JsonUtility.FromJson<ListRequest>(PlayerPrefs.GetString(LIST_REQUEST_KEY));
+                return;
+            }
+            
+            listRequest = Client.List();
+        }
+#endif
+
         public static string GDKAdapter(string sdkId)
         {
             var version = "";
@@ -94,20 +128,54 @@ namespace Amanotes.Editor
             }
             return version.Trim();
         }
+        
+        static string GetPackageVersion(string packageName)
+        {
+#if UNITY_2021_1_OR_NEWER
+            foreach (var package in UnityEditor.PackageManager.PackageInfo.GetAllRegisteredPackages())
+            {
+                if(package.name != packageName) continue;
+                return package.version;
+            }
+            
+#else
+            if (listRequest == null || !listRequest.IsCompleted) return "";
+            
+            if (listRequest.Status != StatusCode.Success)
+            {
+                Debug.LogWarning($"Failed to list packages: {listRequest.Error.message}");
+                return "";
+            }
+
+            if (!PlayerPrefs.HasKey(LIST_REQUEST_KEY))
+            {
+                PlayerPrefs.SetString(LIST_REQUEST_KEY, JsonUtility.ToJson(listRequest));
+                PlayerPrefs.Save();
+            }
+
+            foreach (var package in listRequest.Result)
+            {
+                if(package.name != packageName) continue;
+                
+                return package.version;
+            }
+#endif
+            return "";
+        }
 
         public static string ThirdParty(string sdkId)
         {
             var version = "";
             switch (sdkId)
             {
-            case FIREBASE_ANALYTICS: return FirebaseAnalytics();
-            case FIREBASE_REMOTE_CONFIG: return FirebaseRemoteConfig();
-            case APPSFLYER: return AppsFlyer();
-            case IRONSOURCE: return Ironsource();
-            case REVENUECAT: return RevenueCat();
-            default:
-                Debug.LogWarning($"Unsupported sdkID <{sdkId}>");
-                break;
+                case FIREBASE_ANALYTICS: return FirebaseAnalytics();
+                case FIREBASE_REMOTE_CONFIG: return FirebaseRemoteConfig();
+                case APPSFLYER: return AppsFlyer();
+                case IRONSOURCE: return Ironsource();
+                case REVENUECAT: return RevenueCat();
+                default:
+                    Debug.LogWarning($"Unsupported sdkID <{sdkId}>");
+                    break;
             }
             return version;
         }
@@ -116,7 +184,7 @@ namespace Amanotes.Editor
         {
             var version = "";
             string[] filesFirebase = Directory.GetFiles("Assets", "maven-metadata.xml", SearchOption.AllDirectories);
-            if (filesFirebase.Length <= 0) return version.Trim();
+            if (filesFirebase.Length <= 0) return GetPackageVersion("com.google.firebase.analytics").Trim();
 
             for (var i = 0; i < filesFirebase.Length; i++)
             {
@@ -140,7 +208,7 @@ namespace Amanotes.Editor
         {
             var version = "";
             string[] filesFirebase = Directory.GetFiles("Assets", "maven-metadata.xml", SearchOption.AllDirectories);
-            if (filesFirebase.Length <= 0) return version.Trim();
+            if (filesFirebase.Length <= 0) return GetPackageVersion("com.google.firebase.remote-config").Trim();
 
             for (var i = 0; i < filesFirebase.Length; i++)
             {
@@ -190,7 +258,6 @@ namespace Amanotes.Editor
                     }
                 }
             }
-
             return version.Trim();
         }
 
@@ -213,10 +280,7 @@ namespace Amanotes.Editor
             string[] files = Directory.GetFiles("Assets", "PurchasesWrapper.java", SearchOption.AllDirectories);
             var searchString = "PLUGIN_VERSION";
             var version = "";
-            if (files.Length < 1)
-            {
-                return version;
-            }
+            if (files.Length < 1) return GetPackageVersion("com.revenuecat.purchases-unity").Trim();
 
             foreach (string file in files)
             {
@@ -236,9 +300,16 @@ namespace Amanotes.Editor
 
         internal static List<IronSourceSDKAdapter> IronSourceAdapter()
         {
-            string[] filesIRadapter = Directory.GetFiles("Assets/IronSource", "IS*AdapterDependencies.xml", SearchOption.AllDirectories);
-            List<IronSourceSDKAdapter> listAdapter = new List<IronSourceSDKAdapter>();
-
+            var listAdapter = new List<IronSourceSDKAdapter>();
+            const string IRONSOURCE_PATH = "Assets/IronSource";
+            
+            if (!Directory.Exists(IRONSOURCE_PATH))
+            {
+                return listAdapter;
+            }
+            
+            string[] filesIRadapter = Directory.GetFiles(IRONSOURCE_PATH, "IS*AdapterDependencies.xml", SearchOption.AllDirectories);
+            
             if (filesIRadapter.Length <= 0) return listAdapter;
             for (var i = 0; i < filesIRadapter.Length; i++)
             {

package/Extra/ForceUpdate.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 2e197f38dc0b2460b9efe8fa5958a370
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/AmaGDK.Analytics.cs

@@ -17,6 +17,12 @@ namespace Amanotes.Core
         public static partial class Analytics
         {
             public static bool HasMigrated => localData.migrationLog.count > 0;
+            
+            public static bool enableAnalyticsLog
+            {
+                set => Config.analytics.showAnalyticsLog = value;
+                get => Config.analytics.showAnalyticsLog;
+            }
 
             public interface IEventParamsBuilder { }            
 
@@ -480,7 +486,7 @@ namespace Amanotes.Core
                     NormalizeKeyString(ref eventName, sb, dryRun);
                     if (reservedEvents.Contains(eventName))
                         sb.AppendLine($" - EventName <{eventName}> is reserved and should not be used");
-                    if (sb.Length > 0 && dryRun) LogWarningOnce($"Warning for event name <{eventName}>:\n{sb}", $"NormalizeEventName<{eventName}>");
+                    if (sb.Length > 0 && dryRun) LogWarningOnce($"NormalizeEventName <{eventName}> warnings:\n{sb}\n", $"NormalizeEventName<{eventName}>");
                     sbPool.Return(sb);
                 }
                 Profiler.EndSample();
@@ -1042,7 +1048,7 @@ namespace Amanotes.Core.Internal
     [Serializable] public class AnalyticsConfig
     {
         // [Header("-----     MODULE CONFIG      -----")]
-        public bool showAnalyticsLog = true;
+        public bool showAnalyticsLog;
         public bool normalizeEventName = true;
         public bool checkMigrationIntegrity = true;
         public bool migrateAccumulatedCount = true;

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.52";
+        public const string VERSION = "0.2.53";
 
         internal static AmaGDK _instance;
         internal static Status _status = Status.None;
@@ -90,7 +90,7 @@ namespace Amanotes.Core
             });
             yield return new WaitUntil(() => hookCompleted);
             float elapsed = Time.realtimeSinceStartup - stTime;
-            Log($"[Hook] {nHooks} hooks complete after " + elapsed);
+            Log($"[Hook] {nHooks} hooks complete after {elapsed} secs");
             dispatcher.Dispatch(Event.GDK_HOOK_END);
         }
         
@@ -304,10 +304,10 @@ namespace Amanotes.Core
     public partial class  AmaGDK // Switch dev mode
     {
         #if UNITY_EDITOR
-        [ContextMenu("Change Dev Mode")]
+        [ContextMenu("Change To Dev Mode")]
         public void ChangeDevMode()
         {
-            string variableName = "GDK_HOME";
+            const string variableName = "GDK_HOME";
             string zshrcPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".zshrc");
             string zshrcContent;
         
@@ -341,13 +341,19 @@ namespace Amanotes.Core
                     Debug.LogWarning($"{variableName} environment variable is set but has an empty value in {zshrcPath}.");
                     return;
                 }
+
+                if (!Directory.Exists(gdkHomeValue))
+                {
+                    Debug.LogWarning($"{variableName} environment variable is set to <{gdkHomeValue}> but the path is not exist!");
+                    return;
+                }
             }
         
             string output = RunShellCommand($"source ~/.zshrc && echo file:${variableName}");
             output = output.Trim();
-            UpdateManifest(output); 
-            Debug.Log("AmaGDK changes to dev mode successfully");
-            UnityEditor.AssetDatabase.Refresh();
+            UpdateManifest(output);
+            
+            UnityEditor.AssetDatabase.Refresh(UnityEditor.ImportAssetOptions.ForceUpdate);
         }
             
         private string RunShellCommand(string command)
@@ -368,11 +374,28 @@ namespace Amanotes.Core
             
         private void UpdateManifest(string strDesired)
         {
-            const string manifestPath = "Packages/manifest.json";
-            string manifestJson = File.ReadAllText(manifestPath);
+            try
+            {
+                const string manifestPath = "Packages/manifest.json";
+                string manifestJson = File.ReadAllText(manifestPath);
 
-            manifestJson = Regex.Replace(manifestJson, "\"com\\.amanotes\\.gdk\"\\s*:\\s*\"\\d+\\.\\d+\\.\\d+\"", $"\"com.amanotes.gdk\": \"{strDesired}\"");
-            File.WriteAllText(manifestPath, manifestJson);
+                string pattern = "\"com\\.amanotes\\.gdk\": \"(.*)\"";
+                string devModeEntry = $"\"com.amanotes.gdk\": \"{strDesired}\"";
+                
+                manifestJson = Regex.Replace(manifestJson, pattern, devModeEntry);
+                File.WriteAllText(manifestPath, manifestJson);
+                
+                if (!File.ReadAllText(manifestPath).Contains(devModeEntry))
+                {
+                    Debug.LogWarning($"AmaGDK changes to dev mode failed. The expected value is: {devModeEntry}");
+                    return;
+                }
+                Debug.Log("AmaGDK changes to dev mode successfully");
+            }
+            catch (Exception e)
+            {
+                Debug.LogWarning($"AmaGDK changes to dev exception: {e.Message}");
+            }
         }
         #endif
     }

package/Runtime/Internal/AmaGDK.Internal.cs

@@ -66,6 +66,9 @@ namespace Amanotes.Core.Internal
 
     public static class Logging
     {
+        public static Action<string> logNonfatalErrorHook = null;
+        private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
+        
         public static readonly StringBuilder tmpWarningSB = new StringBuilder();
         public static readonly HashSet<string> logWarningDict = new HashSet<string>();
 
@@ -84,6 +87,12 @@ namespace Amanotes.Core.Internal
         public static void LogError(string message)
         {
             if (Config.common.logLevel >= LogLevel.Error) Debug.LogError($"AmaGDK {message}");
+            if (logNonfatalErrorHook != null)
+            {
+                if (nonFatalDict.Contains(message)) return; // LogOnce
+                nonFatalDict.Add(message);
+                logNonfatalErrorHook(message);
+            }
         }
         public static void Log(string message)
         {

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -459,7 +459,7 @@ namespace Amanotes.Core.Internal
             jsonSb.Append("[");
             var isFirstElement = true;
 
-            foreach (var item in list)
+            foreach (object item in list)
             {
                 if (isFirstElement)
                     isFirstElement = false;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.52",
+    "version": "0.2.53",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",