com.amanotes.gdk 0.2.81-a4 → 0.2.81-alpha.5

package/CHANGELOG.md

@@ -1,14 +1,5 @@
 # Changelog
 
-## [0.2.81-a4] - 2024-11-21
-- [Dev] Add GDKPostBuild for iOS
-- [Dev] Improve GDK editor experience before config asset imported
-- [Dev] Analytics save file in async
-- [Dev] Move GDKFileUtils to a separated file
-- [Dev] Update game ops model
-- [Dev] Add ABLab
-- [Dev] Move imported GDK Adapter from RawData to Modules
-
 ## [0.2.80] - 2024-11-13
 - [Dev] Don't use obsolete functions
 - [Dev] Add CrashlyticHook

package/Editor/Extra/GDKCIBuildCommand.cs

@@ -17,22 +17,27 @@ namespace Amanotes.Core
         private const string KEY_ALIAS_NAME = "KEY_ALIAS_NAME";
         private const string KEYSTORE = "keystore.keystore";
         private const string BUILD_OPTIONS_ENV_VAR = "BuildOptions";
-        private const string ANDROID_BUNDLE_VERSION_CODE = "VERSION_BUILD_VAR";
         private const string ANDROID_APP_BUNDLE = "BUILD_APP_BUNDLE";
         private const string SCRIPTING_BACKEND_ENV_VAR = "SCRIPTING_BACKEND";
         private const string EXPORT_ANDROID_PROJECT = "EXPORT_ANDROID_PROJECT";
         private const string VERSION_NUMBER_VAR = "VERSION_NUMBER_VAR";
-        private const string VERSION_iOS = "VERSION_BUILD_VAR";
+        private const string VERSION_BUILD_VAR = "VERSION_BUILD_VAR";
         
         public static void InstallPod(EventHandler processExit, string buildPath = null)
         {
             try
             {
-                var arguments = $"-c \"/usr/local/bin/pod install --project-directory={buildPath}\"";
+                string arguments = "";
                 if (Application.isBatchMode && TryGetEnv("CI_SCRIPT_DIR", out string scriptDir))
                 {
                     arguments = $"{scriptDir}/utils.sh pod-install";
                 }
+                else if (!Application.isBatchMode)
+                {
+                    string podPath = "/usr/local/bin/pod";
+                    if (!File.Exists(podPath)) podPath = "/opt/homebrew/bin/pod";
+                    arguments = $"-c \"{podPath} install --project-directory={buildPath}\"";
+                }
                 
                 // Configure process start info
                 var startInfo = new ProcessStartInfo
@@ -57,12 +62,6 @@ namespace Amanotes.Core
                     if (args.Data == null) return; // End of the stream
                     Debug.Log(args.Data);
                 };
-                
-                // proc.ErrorDataReceived += (sender, args) =>
-                // {
-                //     if (args.Data == null) return; // End of the stream
-                //     Debug.LogError(args.Data);
-                // };
 
                 proc.Exited += processExit;
 
@@ -71,9 +70,6 @@ namespace Amanotes.Core
                 proc.BeginOutputReadLine();
                 proc.BeginErrorReadLine();
                 proc.WaitForExit();
-
-                // Log exit code
-                // Debug.LogWarning("Process exited with code: " + proc.ExitCode);
             }
             catch (Exception e)
             {
@@ -245,20 +241,16 @@ namespace Amanotes.Core
             var buildTarget = GetBuildTarget();
 
             Console.WriteLine(":: Performing build");
-            if (TryGetEnv(VERSION_NUMBER_VAR, out var bundleVersionNumber))
+            if (TryGetEnv(VERSION_NUMBER_VAR, out string bundleVersionNumber))
             {
-                if (buildTarget == BuildTarget.iOS)
-                {
-                    bundleVersionNumber = GetIosVersion();
-                }
                 Console.WriteLine($":: Setting bundleVersionNumber to '{bundleVersionNumber}' (Length: {bundleVersionNumber.Length})");
                 PlayerSettings.bundleVersion = bundleVersionNumber;
             }
+            HandleBuildNumber(buildTarget);
 
             if (buildTarget == BuildTarget.Android)
             {
                 HandleAndroidAppBundle();
-                HandleAndroidBundleVersionCode();
                 HandleAndroidKeystore();
                 HandleDebugSymbols();
                 HandleExportAndroidProject();
@@ -276,6 +268,7 @@ namespace Amanotes.Core
             if (buildReport.summary.result != UnityEditor.Build.Reporting.BuildResult.Succeeded)
                 throw new Exception($"Build ended with {buildReport.summary.result} status");
 
+            BuildMetadata.Save(buildPath, buildTarget);
             Console.WriteLine(":: Done with build");
         }
 
@@ -299,18 +292,24 @@ namespace Amanotes.Core
             }
         }
 
-        private static void HandleAndroidBundleVersionCode()
+        private static void HandleBuildNumber(BuildTarget buildTarget)
         {
-            if (TryGetEnv(ANDROID_BUNDLE_VERSION_CODE, out string value))
+            if (!TryGetEnv(VERSION_BUILD_VAR, out string value)) return;
+            if (int.TryParse(value, out int version))
             {
-                if (int.TryParse(value, out int version))
+                if (buildTarget == BuildTarget.Android)
                 {
-                    PlayerSettings.Android.bundleVersionCode = version;
-                    Console.WriteLine($":: {ANDROID_BUNDLE_VERSION_CODE} env var detected, set the bundle version code to {value}.");
+                    PlayerSettings.Android.bundleVersionCode = version;    
                 }
-                else
-                    Console.WriteLine($":: {ANDROID_BUNDLE_VERSION_CODE} env var detected but the version value \"{value}\" is not an integer.");
+                else if (buildTarget == BuildTarget.iOS)
+                {
+                    PlayerSettings.iOS.buildNumber = version.ToString();
+                }
+                    
+                Console.WriteLine($":: {VERSION_BUILD_VAR} env var detected, set the bundle version code to {value}.");
             }
+            else
+                Console.WriteLine($":: {VERSION_BUILD_VAR} env var detected but the version value \"{value}\" is not an integer.");
         }
 
         private static void HandleExportAndroidProject()
@@ -323,22 +322,6 @@ namespace Amanotes.Core
             }
         }
 
-        private static string GetIosVersion()
-        {
-            if (TryGetEnv(VERSION_iOS, out string value))
-            {
-                if (int.TryParse(value, out int version))
-                {
-                    Console.WriteLine($":: {VERSION_iOS} env var detected, set the version to {value}.");
-                    return version.ToString();
-                }
-                else
-                    Console.WriteLine($":: {VERSION_iOS} env var detected but the version value \"{value}\" is not an integer.");
-            }
-
-            throw new ArgumentNullException(nameof(value), $":: Error finding {VERSION_iOS} env var");
-        }
-
         private static void HandleAndroidKeystore()
         {
 #if UNITY_2019_1_OR_NEWER
@@ -394,6 +377,31 @@ namespace Amanotes.Core
         }
     }
     
+    [Serializable]
+    public class BuildMetadata
+    {
+        public string appVersion;
+        public string buildNumber;
+        public string buildTarget; 
+        
+        public static void Save(string buildPath, BuildTarget buildTarget)
+        {
+            string outputFile = Path.Combine(buildPath, "build_info.json");
+
+            var metadata = new BuildMetadata
+            {
+                appVersion = PlayerSettings.bundleVersion,
+                buildNumber = buildTarget == BuildTarget.Android ? PlayerSettings.Android.bundleVersionCode.ToString() : PlayerSettings.iOS.buildNumber,
+                buildTarget = buildTarget.ToString()
+            };
+
+            string json = JsonUtility.ToJson(metadata, prettyPrint: true);
+            File.WriteAllText(outputFile, json);
+
+            Console.WriteLine($":: Build information saved to {outputFile}");
+        }
+    }
+    
     public class GDKPreProcessBuild: IPreprocessBuildWithReport
     {
         public int callbackOrder
@@ -402,20 +410,14 @@ namespace Amanotes.Core
         }
         public void OnPreprocessBuild(BuildReport report)
         {
-            if (report.summary.platform == BuildTarget.Android)
-            {
-                // Change Gradle path when running in headless mode (CI Machine)
-                if (Application.isBatchMode)
-                {   
-                    if (GDKCIBuildCommand.TryGetEnv("GRADLE_PATH", out string envGradlePath))
-                    {
-                        EditorPrefs.SetBool("GradleUseEmbedded", false);
-                        EditorPrefs.SetString("GradlePath", envGradlePath);
-                        Debug.Log("Update gradle path to: " + envGradlePath);
-                    }
-                }
-            }
-            
+            if (report.summary.platform != BuildTarget.Android) return;
+            // Change Gradle path when running in headless mode (CI Machine)
+            if (!Application.isBatchMode) return;
+            if (!GDKCIBuildCommand.TryGetEnv("GRADLE_PATH", out string envGradlePath)) return;
+            EditorPrefs.SetBool("GradleUseEmbedded", false);
+            EditorPrefs.SetString("GradlePath", envGradlePath);
+            Debug.Log("Update gradle path to: " + envGradlePath);
+
         }
     }
 }

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -93,7 +93,7 @@ namespace Amanotes.Core
             
             internal void Save()
             {
-                this.SaveJsonToFile(false);
+                this.SaveJsonToFile();
             }
         }
 

package/Runtime/AmaGDK.Analytics.cs

@@ -135,7 +135,7 @@ namespace Amanotes.Core
                 
                 if (!localData._dirty) return;
                 localData._dirty = false;
-                localData.SaveJsonToFile(true); // immediately = true
+                localData.SaveJsonToFile();
             }
 
             public static IEventParamsBuilder LogFunnelEvent(string eventName, string signature = "")
@@ -314,7 +314,7 @@ namespace Amanotes.Core
             internal static readonly GDKPool.Pool<EventParams> epPool = new GDKPool.Pool<EventParams>(1);
 
             private static readonly Lazy<AnalyticsData> _localData = new Lazy<AnalyticsData>(
-                () => new AnalyticsData().ReloadDataFromLocal());
+                () => new AnalyticsData().LoadJsonFromFile().BuildCache());
             internal static AnalyticsData localData => _localData.Value;
             
             internal static readonly Dictionary<string, string> reservedPrefixes = new Dictionary<string, string>()
@@ -800,12 +800,6 @@ namespace Amanotes.Core
                     return this;
                 }
                 
-                public AnalyticsData ReloadDataFromLocal()
-                {
-                    this.LoadJsonFromFile().BuildCache();
-                    return this;
-                }
-                
                 internal EventDetail GetEventDetail(string eventName, bool autoNew = false)
                 {
                     if (string.IsNullOrEmpty(eventName)) return null;
@@ -849,7 +843,7 @@ namespace Amanotes.Core
                     if (!Config.analytics.autoFlushEventDetail) return;
                     if (!_dirty) return;
                     _dirty = false;
-                    this.SaveJsonToFile(false);
+                    this.SaveJsonToFile();
                 }
 
                 internal void UpdateMigrationLog()

package/Runtime/AmaGDK.Consent.cs

@@ -66,7 +66,7 @@ namespace Amanotes.Core
                     ConsentHook.ATTRequest(isAllowed =>
                     {
                         data.att = isAllowed ? Status.Allowed : Status.NotAllowed;
-                        data.SaveJsonToFile(false);
+                        data.SaveJsonToFile();
                         onComplete?.Invoke(allowedATT);
                     });
                 }
@@ -107,7 +107,7 @@ namespace Amanotes.Core
                         if (successful)
                         {
                             data.cmp = !IsRequired ? Status.NotRequired : Status.Allowed;
-                            data.SaveJsonToFile(false);
+                            data.SaveJsonToFile();
                         }
                         onComplete?.Invoke(checkedCMP);
                     });

package/Runtime/AmaGDK.IAP.cs

@@ -306,7 +306,7 @@ namespace Amanotes.Core
                     subscriptionExpiredDate = _subscriptionExpiredDate?.ToString(DATE_FORMAT);
                     _unsubscribedDate = Adapter.GetUnsubscribedDate();
                     unsubscribedDate = _unsubscribedDate?.ToString(DATE_FORMAT);
-                    this.SaveJsonToFile(false);
+                    this.SaveJsonToFile();
                 }
             }
         }

package/Runtime/AmaGDK.UserProfile.cs

@@ -33,14 +33,14 @@ namespace Amanotes.Core
             private bool _dirty = false;
             private void Save()
             {
-                this.SaveJsonToFile(false);
+                this.SaveJsonToFile();
             }
             
             private void SaveIfDirty()
             {
                 if (!_dirty) return;
                 _dirty = false;
-                this.SaveJsonToFile(false);
+                this.SaveJsonToFile();
             }
         }
 

package/Runtime/AmaGDK.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.81-a4";
+        public const string VERSION = "0.2.80";
         
         internal static Status _status = Status.None;
         internal static ConfigAsset _config = null;

package/Runtime/Core/GDKDebug.cs

@@ -38,13 +38,16 @@ namespace Amanotes.Core
     {
         public static Action<string> logNonfatalErrorHook = null;
         private static readonly HashSet<string> nonFatalDict = new HashSet<string>();
-        public static readonly HashSet<string> logWarningDict = new HashSet<string>();
+        private static readonly HashSet<string> logWarningDict = new HashSet<string>();
         
         public static void LogWarningOnce(string message, string key = null)
         {
             if (AmaGDK.logLevel < LogLevel.Warning) return;
             if (string.IsNullOrEmpty(key)) key = message;
-            if (!logWarningDict.Add(key)) return;
+            lock (logWarningDict)
+            {
+                if (!logWarningDict.Add(key)) return;
+            }
             
             using (NoStackTrace.Warning)
             {
@@ -71,14 +74,20 @@ namespace Amanotes.Core
             
             if (GDKUtils.isOnMainThread) // Most of the time
             {
-                if (!nonFatalDict.Add(message)) return;
+                lock (nonFatalDict)
+                {
+                    if (!nonFatalDict.Add(message)) return;
+                }
                 logNonfatalErrorHook(message);
                 return;
             }
             
             GDKUtils.DoOnMainThread(() =>
             {
-                if (!nonFatalDict.Add(message)) return; // LogOnce
+                lock (nonFatalDict)
+                {
+                    if (!nonFatalDict.Add(message)) return; // LogOnce
+                }
                 logNonfatalErrorHook(message);
             });
         }

package/Runtime/Internal/AmaGDK.Utils.cs

@@ -200,7 +200,7 @@ namespace Amanotes.Core.Internal
             return GDKFileUtils.LoadJsonFromFile(instance);
         }
 
-        internal static void SaveJsonToFile<T>(this T instance, bool immediately) where T: IJsonFile
+        internal static void SaveJsonToFile<T>(this T instance, bool immediately = true) where T: IJsonFile
         {
             GDKFileUtils.SaveJsonToFile(instance, immediately);
         }

package/Runtime/Internal/ForceQuitMonitor.cs

@@ -34,7 +34,7 @@ namespace Amanotes.Core.Internal
             internal void SaveIfDirty(bool forceSave = false)
             {
                 if (!isDirty && !forceSave) return;
-                this.SaveJsonToFile(true);
+                this.SaveJsonToFile();
                 isDirty = false;
             }
         }

package/Runtime/Utils/GDKFileUtils.cs

@@ -236,7 +236,7 @@ namespace Amanotes.Core.Internal
             return instance;
         }
         
-        public static void SaveJsonToFile<T>(T instance, bool immediately)
+        public static void SaveJsonToFile<T>(T instance, bool immediately = true)
         {
             string fileName = instance.GetType().Name;
             string json = JsonUtility.ToJson(instance);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.81-a4",
+    "version": "0.2.81-alpha.5",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",
@@ -8,7 +8,7 @@
         "Amanotes",
         "Amanotes GDK",
         "vh-name:AmaGDK"
-    ],    
+    ],
     "author": {
         "name": "Amanotes",
         "email": "tech.support@amanotes.com",
@@ -16,5 +16,5 @@
     },
     "changelogUrl": "https://amagdk.notion.site/Change-Log-6dfd4b67d64f496bbd9eb04ccb4ef95a",
     "documentationUrl": "https://amagdk.notion.site/amagdk/Ama-GDK-a73596617ab247b6a43c8f12a1581415",
-    "license": "MIT"    
-}
+    "license": "MIT"
+}