com.amanotes.gdk 0.2.79 → 0.2.80-f2

package/CHANGELOG.md

@@ -1,4 +1,14 @@
-# Changelog
+## [0.2.80-f2] - 2025-02-04
+- [Fix] Send GDKVersionTracking only for Android/iOS
+
+## [0.2.80-f1] - 2024-12-17
+- [Dev] Add Release Script
+- [Fix] GetStackTrace only works on main thread
+- [Fix] Missing userData parameters in AdEventTracking
+
+## [0.2.80] - 2024-11-13
+- [Dev] Don't use obsolete functions
+- [Dev] Add CrashlyticHook
 
 ## [0.2.79] - 2024-11-13
 - [Dev] Add callbacks for IAP module
@@ -10,7 +20,6 @@
 - [Dev] Track Adapters and Third-party packages used in games
 
 ## [0.2.77] - 2024-11-07
-- [Release] 0.2.76
 - [Dev] Remove GDKAudio
 - [Dev] Handle format exception in RemoteConfig
 - [Dev] Handle exception of FetchConfig

package/Editor/Extra/SDKVersionTracking.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
 using System.Net.Http;
 using System.Text;
 using System.Xml;
@@ -269,6 +270,28 @@ namespace Amanotes.Editor
         [PostProcessBuild(999)]
         public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
         {
+            if (target != BuildTarget.Android && target != BuildTarget.iOS) return;
+
+            if (string.IsNullOrWhiteSpace(Application.productName) || Application.productName.ToLower() == "my project")
+            {
+                Debug.LogWarning("AmaGDK | [SDKVersionTracking] Please correct Application.productName");
+                return;
+            }
+            
+            if (string.IsNullOrWhiteSpace(PlayerSettings.applicationIdentifier) 
+                || PlayerSettings.applicationIdentifier.ToLower().StartsWith("com.defaultcompany") 
+                || PlayerSettings.applicationIdentifier.ToLower().StartsWith("com.unity-technologies"))
+            {
+                Debug.LogWarning("AmaGDK | [SDKVersionTracking] Please correct PlayerSettings.applicationIdentifier");
+                return;
+            }
+            
+            if (string.IsNullOrWhiteSpace(PlayerSettings.bundleVersion) || PlayerSettings.bundleVersion == "0")
+            {
+                Debug.LogWarning("AmaGDK | [SDKVersionTracking] Please correct PlayerSettings.bundleVersion");
+                return;
+            }
+            
             var rawData = _dicThirdPartyVersion
                 .Concat(_dicImportedGDKAdapter)
                 .Concat(_dicExtraVersion)
@@ -317,7 +340,12 @@ namespace Amanotes.Editor
                 else
                 {
                     string errorData = await response.Content.ReadAsStringAsync();
-                    Debug.LogError($"AmaGDK | [SDKVersionTracking] Status code {response.StatusCode} Error Response: {errorData}");
+                    string errorMessage = $"AmaGDK | [SDKVersionTracking] Status code {response.StatusCode} Error Response: {errorData}";
+                    if ((int)response.StatusCode == 409)
+                    {
+                        throw new Exception(errorMessage);
+                    }
+                    Debug.LogError(errorMessage);
                 }
             }
             catch (HttpRequestException e)

package/Extra/{SDKVersionTracking.unitypackage.meta → CrashlyticHook.unitypackage.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: cbf5a5557d9ac40ab83b6587b81640cb
+guid: f1f8828296a16440f8aab012f540cebd
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Runtime/Ad/AmaGDK.Ads.cs

@@ -345,6 +345,7 @@ namespace Amanotes.Core.Internal
     {
         protected AdShowContext context => Ads.context;
         protected AdModuleConfig moduleConfig => Config.ad;
+        public Dictionary<string, object> userData => context?.userData;
 
         // APIs
         internal protected abstract AdLogic interstitial { get; }

package/Runtime/AmaGDK.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.79";
+        public const string VERSION = "v0.2.80-f2";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;

package/Runtime/Core/GDKDebug.cs

@@ -12,10 +12,10 @@ namespace Amanotes.Core
         Verbose
     }
 
-    internal struct NoStackTrace : IDisposable
+    internal readonly struct NoStackTrace : IDisposable
     {
-        internal LogType logType;
-        internal StackTraceLogType stackTraceType;
+        internal readonly LogType logType;
+        internal readonly StackTraceLogType stackTraceType;
 
         internal NoStackTrace(LogType logType)
         {
@@ -34,19 +34,32 @@ namespace Amanotes.Core
         public static NoStackTrace Log => new NoStackTrace(LogType.Log);
     }
     
+    internal readonly struct NoStackTraceNull: IDisposable
+    {
+        public void Dispose()
+        {
+            
+        }
+    }
+    
     public class GDKDebug
     {
+        internal static readonly IDisposable NoStackTraceNull = new NoStackTraceNull();
+        
         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)
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Warning: NoStackTraceNull)
             {
                 Debug.LogWarning($"AmaGDK {message}"); 
             }
@@ -54,39 +67,40 @@ namespace Amanotes.Core
         public static void LogWarning(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Warning) return;
-            using (NoStackTrace.Warning)
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Warning: NoStackTraceNull)
             {
-                Debug.LogWarning($"AmaGDK {message}"); 
+                Debug.LogWarning($"AmaGDK {message}");
             }
         }
         public static void LogError(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Error) return;
-            using (NoStackTrace.Error)
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Error: NoStackTraceNull)
             {
-                Debug.LogError($"AmaGDK {message}");    
+                Debug.LogError($"AmaGDK {message}");
             }
             
             if (logNonfatalErrorHook == null) return;
             
             if (GDKUtils.isOnMainThread) // Most of the time
             {
-                if (!nonFatalDict.Add(message)) return;
-                logNonfatalErrorHook(message);
+                LogNonFatalOnMainThread(message);
                 return;
             }
             
-            GDKUtils.DoOnMainThread(() =>
-            {
-                if (!nonFatalDict.Add(message)) return; // LogOnce
-                logNonfatalErrorHook(message);
-            });
+            GDKUtils.DoOnMainThread(() => { LogNonFatalOnMainThread(message); });
+        }
+
+        private static void LogNonFatalOnMainThread(string message)
+        {
+            if (!nonFatalDict.Add(message)) return;
+            logNonfatalErrorHook(message);
         }
         
         public static void Log(string message)
         {
             if (AmaGDK.logLevel < LogLevel.Verbose) return;
-            using (NoStackTrace.Log)
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Log: NoStackTraceNull)
             {
                 Debug.Log($"AmaGDK {message}");   
             }
@@ -94,7 +108,7 @@ namespace Amanotes.Core
         
         public static void ForceLog(string message)
         {
-            using (NoStackTrace.Log)
+            using (GDKUtils.isOnMainThread ? NoStackTrace.Log: NoStackTraceNull)
             {
                 Debug.Log($"AmaGDK {message}");
             }

package/Runtime/GDKAudio/Plugins.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 556517e393f149748cf9890d5d436491
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/GDKAudio.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 19f1c4b4ece54d438bb89c63b87846bf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.79",
+    "version": "0.2.80-f2",
     "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"
+}