com.amanotes.gdk 0.2.75 → 0.2.78

package/CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## [0.2.78] - 2024-11-11
+- [Dev] Add iOS and Android ad unit configuration for MAX
+- [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
+- [Fix] Corrected handling of events after LogImmediately()
+- [Dev] Convert value with invariant culture in Remote Config
+- [Feature] Support AppsFlyer 6.15.x by default
+- [Dev] GameOpsSDK
+- [Dev] Fix bug missing ads callback on iOS
+- [Dev] Add OnAdReady logging
+- [Dev] Add more params to impressionData
+- [CI] Update pipeline
+- [Dev] Rework GDK_Example
+- [Dev] Early validate IDFA, GAId and update pattern of AmaDeviceId
+- [Dev] Add device memory info to gdk_init
+- [Dev] Do not use Dispatcher in Init phase (optimize for performance)
+- [Dev] Reduce calls to DoOnMainThread for start stop GDKRoutine
+- [Dev] Minor clean up
+- [Dev] Add memory profiler
+- [CI] Enable cache
+- [Dev] Add Package Installer
+- [Dev] Add Klavar event alias
+- [CI] Disable CI cache temporarily
+- [Dev] Use Array.Fill instead of loop
+- [Fix] Clear cached audio buffer when not playing
+- Revert "[Dev] Upgrade api level 34 for GDKDev"
+- This reverts commit 6ea19dec18c3f2cb0a8000ae746bc58f0b3f3dc2.
+- [Dev] Decouple IronSource AdQuality
+- [Dev] Upgrade api level 34 for GDKDev
+- [Dev] Improve GDKConfig
+- [Dev] Upload test result as artifact
+- [Dev] Add default-manifest for integration test project
+- [CI] Enhance error handling in integration_test.sh
+- [CI] update export-android job to wait for export-ios completion
+- [Dev] Activate Unity license once during integration tests
+- [Dev] Export Packages
+- [Dev] Add AutoEventQC extra package
+- [Dev] Integration test
+- [Dev] Show consent config on Inspector
+- [Dev] Ignore LevelPlay to keep the hard link locally
+
+## [0.2.76] - 2024-11-07
+
 ## [0.2.75] - 2024-09-20
 - [Dev] Use GDKUtils.StartCoroutine to capture exceptions
 - [Fix] Initialize modules lazily to fix AmaGDK serialization layout mismatch

package/Editor/AmaGDKEditor.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -24,11 +24,11 @@ namespace Amanotes.Editor
         private static readonly Color ORANGE = new Color32(0xFF, 0xC0, 0x00, 0xFF);
 
         [NonSerialized] private static AmaGDK sdk;
-        [NonSerialized] private static ConfigAsset configAsset;
         [NonSerialized] private static UnityObject invalidConfigAsset;
         [NonSerialized] private static SerializedObject configSO;
         [NonSerialized] private static UnityEditor.Editor editor;
 
+        private static ConfigAsset configAsset => AmaGDK.Config;
         private static bool showIRSAdapter;
         private static bool showConfigDetail;
         private static bool showAdapterInstaller;
@@ -62,7 +62,7 @@ namespace Amanotes.Editor
 
             SDKStatus.ClearCache();
             RefreshConfigStatus();
-            RefreshListAdapters();
+	        RefreshListAdapters();
         }
 
         internal enum ConfigAssetStatus
@@ -92,7 +92,6 @@ namespace Amanotes.Editor
                 return;
             }
             
-            configAsset = Resources.Load<ConfigAsset>("AmaGDKConfig");
             cfgStatus = configAsset != null ? ConfigAssetStatus.AssetOk : ConfigAssetStatus.AssetIsInvalid;
             if (cfgStatus == ConfigAssetStatus.AssetOk) adapterScanned = false;
         }
@@ -277,12 +276,7 @@ namespace Amanotes.Editor
                 {
                     if (AmaGUI.BigButton("CREATE", 40f, BLUE))
                     {
-                        ScriptableObject config = CreateInstance("Amanotes.Core.AmaGDKConfigAsset");
-                        var resourcePath = "Assets/AmaGDK/Resources";
-                        Directory.CreateDirectory(resourcePath);
-                        
-                        AssetDatabase.CreateAsset(config, Path.Combine(resourcePath, "AmaGDKConfig.asset"));
-                        AssetDatabase.SaveAssets();
+                        CreateGDKConfig();
                         RefreshConfigStatus();
                     }
 
@@ -308,6 +302,16 @@ namespace Amanotes.Editor
                 GUILayout.ExpandWidth(true));
         }
 
+        internal static void CreateGDKConfig()
+        {
+            ScriptableObject config = CreateInstance("Amanotes.Core.AmaGDKConfigAsset");
+            var resourcePath = "Assets/AmaGDK/Resources";
+            Directory.CreateDirectory(resourcePath);
+                        
+            AssetDatabase.CreateAsset(config, Path.Combine(resourcePath, "AmaGDKConfig.asset"));
+            AssetDatabase.SaveAssets();
+        }
+
         public override void OnInspectorGUI()
         {
             Profiler.BeginSample("GDKEditor.OnInspectorGUI()");
@@ -359,6 +363,7 @@ namespace Amanotes.Editor
             DrawProperty(configSO, "enableAudioModule", false);
             DrawProperty(configSO, "enableServerTime", false);
             DrawProperty(configSO, "enableGeoLocation", false);
+            DrawProperty(configSO, "autoGetConsent", false);
             GUILayout.Space(8f);
             
             for (var i = 0; i < allAdapters.Count; i++)
@@ -378,6 +383,13 @@ namespace Amanotes.Editor
                 GDKAutoUpdateAdapter.ImportAdapters();
             }
             
+            // Always apply changes to the config asset, but only save to disk if not in play mode            
+            if (configSO.ApplyModifiedProperties() && !Application.isPlaying)
+            {
+                EditorUtility.SetDirty(configAsset);
+                AssetDatabase.SaveAssets();
+            }
+            
             Profiler.EndSample();
         }
 
@@ -553,7 +565,6 @@ namespace Amanotes.Editor
                     if (adapter is RemoteConfigAdapter) EditorGUILayout.PropertyField(configSO.FindProperty("remoteConfig"), new GUIContent("Shared settings for Remote Config Modules"));
                     GUI.contentColor = c;
                 }
-                configSO.ApplyModifiedProperties();
             }
             EditorGUIUtility.labelWidth -= 70;
             EditorGUI.EndDisabledGroup();
@@ -578,11 +589,9 @@ namespace Amanotes.Editor
             while (property.NextVisible(first))
             {
                 first = false;
-                if (!property.propertyPath.Contains(basePath)) break;
-                EditorGUILayout.PropertyField(property);
+                if (!property.propertyPath.Contains(basePath)) break;                
+                EditorGUILayout.PropertyField(property);                
             }
-
-            so.ApplyModifiedProperties();
         }
 
         private static Adapter2 GetAdapter(string id)

package/Editor/Extra/SDKVersionTracking.cs

@@ -12,6 +12,8 @@ using UnityEditor.Build.Reporting;
 using UnityEngine;
 using System.Threading.Tasks;
 using UnityEditor.Callbacks;
+using System.Reflection;
+
 
 #if UNITY_IOS
 using UnityEditor.iOS.Xcode;
@@ -43,6 +45,7 @@ namespace Amanotes.Editor
         
         private const int MAX_VERSION_KEY_LENGTH = 30;
         private static Dictionary<string, object> _dicThirdPartyVersion = new Dictionary<string, object>();
+        private static Dictionary<string, object> _dicImportedGDKAdapter = new Dictionary<string, object>();
         private static Dictionary<string, object> _dicExtraVersion = new Dictionary<string, object>();
         private static Dictionary<string, object> _dicIronSourceAdapterVersion = new Dictionary<string, object>();
 
@@ -192,6 +195,29 @@ namespace Amanotes.Editor
             };
         }
 
+        public static Dictionary<string, object> GetImportedGDKAdapter()
+        {
+            var dicGDKAdapters = new Dictionary<string, object>();
+            var config = Resources.Load<ConfigAsset>("AmaGDKConfig");
+            foreach (var field in config
+                .GetType()
+                .GetFields(BindingFlags.Instance | BindingFlags.NonPublic))
+            {
+                var fieldValue = field.GetValue(config);
+                if (fieldValue is Adapter2 adapter)
+                {
+                    string gdkAdapterName = field.Name + "Adapter";
+                    dicGDKAdapters[gdkAdapterName] = adapter.enabled? "Enabled" : "Disabled";
+                }
+                else
+                {
+                    continue;
+                }
+            }
+
+            return dicGDKAdapters;
+        }
+
         private static void WriteToStreamingAssets()
         {
             try
@@ -201,6 +227,7 @@ namespace Amanotes.Editor
 
                 AppendVersion(sb, "BUILD INFO", GetBuildInfo());
                 AppendVersion(sb, "THIRD PARTY", _dicThirdPartyVersion);
+                AppendVersion(sb, "IMPORTED GDK ADAPTERS", _dicImportedGDKAdapter);
                 AppendVersion(sb, "IS ADAPTER", _dicIronSourceAdapterVersion);
                 AppendVersion(sb, "EXTRA", _dicExtraVersion);
                 
@@ -226,6 +253,7 @@ namespace Amanotes.Editor
         public void OnPreprocessBuild(BuildReport report)
         {
             _dicThirdPartyVersion = AmaGDKExtra.GetThirdPartyVersions();
+            _dicImportedGDKAdapter = GetImportedGDKAdapter();
             _dicIronSourceAdapterVersion = AmaGDKExtra.GetIronSourceAdapterVersions();
             _dicExtraVersion = _getExtraSDKVersion?.Invoke() ?? _dicExtraVersion;
 
@@ -242,6 +270,7 @@ namespace Amanotes.Editor
         public static void OnPostProcessBuild(BuildTarget target, string pathToBuiltProject)
         {
             var rawData = _dicThirdPartyVersion
+                .Concat(_dicImportedGDKAdapter)
                 .Concat(_dicExtraVersion)
                 .Concat(_dicIronSourceAdapterVersion.ToDictionary(kvp => kvp.Key, kvp => (object)("IS_" + kvp.Value)))
                 .ToDictionary(x => x.Key, x => x.Value);

package/Editor/Utils/GDKPackageInstaller.cs

@@ -0,0 +1,116 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text.RegularExpressions;
+using Amanotes.Core;
+using UnityEditor;
+using UnityEditor.PackageManager;
+using UnityEditor.PackageManager.Requests;
+using UnityEngine;
+
+namespace Amanotes.Editor
+{
+    [System.Serializable]
+    internal class ScopedRegistry
+    {
+        public string name;
+        public string url;
+        public string[] scopes;
+    }
+
+    [System.Serializable]
+    internal class ScopedRegistries
+    {
+        public ScopedRegistry[] scopedRegistries;
+    }
+
+    internal class GDKPackageInstaller
+    {
+        private static AddRequest _addRequest;
+        private static Action _onAddRequestCompleted;
+
+        internal static void AddScope(string name, string url, string[] scopes)
+        {
+            try
+            {
+                const string manifestPath = "Packages/manifest.json";
+                var manifestJson = File.ReadAllText(manifestPath);
+
+                var registries = JsonUtility.FromJson<ScopedRegistries>(manifestJson);
+                var scopedRegistry = registries.scopedRegistries;
+
+                if (scopedRegistry != null)
+                {
+                    if(IsScopesExist(scopes, scopedRegistry))
+                        return;
+                    Array.Resize(ref registries.scopedRegistries, scopedRegistry.Length + 1);
+                }
+                else
+                {
+                    registries.scopedRegistries = new ScopedRegistry[1];
+                }
+
+                registries.scopedRegistries[registries.scopedRegistries.Length - 1] = new ScopedRegistry
+                {
+                    name = name,
+                    scopes = scopes,
+                    url = url
+                };
+
+                const string pattern = "\"dependencies\"\\s*:\\s*\\{(.+?)\\}";
+                Match match = Regex.Match(manifestJson, pattern, RegexOptions.Singleline);
+                manifestJson = "{" + $"{match.Value},{JsonUtility.ToJson(registries).Remove(0, 1)}";
+                File.WriteAllText(manifestPath, manifestJson);
+
+                // Double check
+                manifestJson = File.ReadAllText(manifestPath);
+                registries = JsonUtility.FromJson<ScopedRegistries>(manifestJson);
+                scopedRegistry = registries.scopedRegistries;
+
+                if (scopedRegistry == null || IsScopesExist(scopes, scopedRegistry) == false)
+                {
+                    Debug.LogWarning("Failed to add new scopes to the manifest");
+                    return;
+                }
+                AssetDatabase.Refresh(ImportAssetOptions.ForceUpdate);
+                Client.Resolve();
+                Debug.Log("Successfully add new scopes to the manifest");
+            }
+            catch (IOException e)
+            {
+                Debug.LogWarning($"Failed to add new scopes to the manifest : {e}");
+            }
+        }
+
+        private static bool IsScopesExist(string[] scopes, ScopedRegistry[] scopedRegistries)
+        {
+            return scopes.All(scopeToCheck => scopedRegistries
+                .SelectMany(registry => registry.scopes)
+                .Any(scope => scope.ToString() == scopeToCheck));
+        }
+
+        internal static void InstallPackage(string package, Action callback)
+        {
+            EditorApplication.update -= AddPackageProgress;
+            EditorApplication.update += AddPackageProgress;
+            _addRequest = Client.Add(package);
+            _onAddRequestCompleted = callback;
+        }
+
+        private static void AddPackageProgress()
+        {
+            if (_addRequest == null || _addRequest.IsCompleted == false)
+                return;
+            if (_addRequest.Status == StatusCode.Success)
+            {
+                EditorApplication.update -= AddPackageProgress;
+                _onAddRequestCompleted?.Invoke();
+            }
+            else if (_addRequest.Status == StatusCode.Failure)
+            {
+                Debug.LogWarning("Fail to add new package");
+            }
+            _addRequest = null;
+        }
+    }
+}

package/Editor/Utils/GDKPackageInstaller.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 53696434971b84be1952094cf8394336
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/{Runtime/GDKAudio/Plugins/iOS.meta → Extra/AutoEventQC.unitypackage.meta}

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 4dd306252a3244a37808570f9979dfbd
-folderAsset: yes
+guid: 01e544bb41adc44a7a1b8b41cb7b63eb
 DefaultImporter:
   externalObjects: {}
   userData: 

package/{Runtime/GDKAudio/Plugins/macOS.meta → Packages/IronSourceAdapter.AdQuality.unitypackage.meta}

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 3fd1ceb1d6c8d43379e780718f6f38f5
-folderAsset: yes
+guid: fbd8abe022fe742a1a1fa38c740ce072
 DefaultImporter:
   externalObjects: {}
   userData: 

package/Runtime/Ad/AdLogic.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using UnityEngine;
 using static Amanotes.Core.GDKDebug;
@@ -131,17 +132,8 @@ namespace Amanotes.Core.Internal
         protected bool _isRequesting;
         protected bool _isInterstitial => adType == AdType.Interstitial;
         
-        // Do not warn unused variable, it's been use outside of Editor (Runtime)
-        #pragma warning disable
-        private bool isFocus;
-        #pragma warning enable
-        
         public void StartShowAd()
         {
-            isFocus = false;
-            unityCallbacks.OnApplicationFocus -= OnApplicationFocus;
-            unityCallbacks.OnApplicationFocus += OnApplicationFocus;
-            
             if (_showState != ShowAdsState.None)
             {
                 LogWarning("[Ad] StartShowAd() --> Invalid _showState: " + _showState);
@@ -163,14 +155,6 @@ namespace Amanotes.Core.Internal
             _showAdRoutine = GDKUtils.StartCoroutine(ShowAdRoutine());
         }
 
-        private void OnApplicationFocus(bool focus)
-        {
-            if (!focus) return;
-            
-            unityCallbacks.OnApplicationFocus -= OnApplicationFocus;
-            isFocus = true;
-        }
-
         public void StopShowAd()
         {
             Log($"[Ad] {adType} StopShowAd");
@@ -238,14 +222,59 @@ namespace Amanotes.Core.Internal
             _showState = ShowAdsState.Showing;
             OnAdShowReadyStatus(true, AdShowReadyStatus.Ready);
             TriggerBeforeAdShow();
+            #if !UNITY_EDITOR && UNITY_ANDROID
+            GDKUtils.StartCoroutine(HandleAdActivityKilledSilently());
+            #endif
             ShowAd();
-
             yield return WaitForMediationCallback();
-            
-            // wait 1 frame in case hasReward callback after onClose
-            if (!context.hasReward && adType == AdType.VideoReward && !context.hasFailedOrCancelled) yield return null;
             ShowAdRoutineCompleted(context.isSuccess);
         }
+        
+        private IEnumerator WaitForMediationCallback()
+        {
+            while (context != null && !context.potentiallyCompleted)
+            {
+                yield return null;
+            }
+            // wait 1 frame in case hasReward callback after onClose
+            if (context != null && !context.hasReward && adType == AdType.VideoReward && !context.hasFailedOrCancelled) yield return null;
+        }
+
+        private IEnumerator HandleAdActivityKilledSilently()
+        {
+            bool hasOutOfFocus = false;
+            bool hasFocusAgain = false;
+            Action<bool> onApplicationFocusCallback = focus =>
+            {
+                if (focus)
+                {
+                    hasFocusAgain = true;
+                }
+                else
+                {
+                    hasOutOfFocus = true;
+                }
+            };
+            unityCallbacks.OnApplicationFocus += onApplicationFocusCallback;
+            int counter = 0;
+            while (context != null && !context.potentiallyCompleted)
+            {
+                if (hasFocusAgain && hasOutOfFocus)
+                {
+                    // Start counting frames only after closed the ad
+                    counter++;
+                }
+                if (counter > MAX_FRAMES_WAIT_FOR_CALLBACK)
+                {
+                    // Timeout reached, force close the ad
+                    LogError("Force close the ad");
+                    StopShowAd();
+                    break;
+                }
+                yield return null;
+            }
+            unityCallbacks.OnApplicationFocus -= onApplicationFocusCallback;
+        }
 
         private void EndShowAdRoutineWithFailure(AdShowReadyStatus status)
         {
@@ -280,40 +309,8 @@ namespace Amanotes.Core.Internal
                 Log("[Ad] WaitForAd success after " + counter + " | timeout = " + timeout + " secs");
                 break;
             }
-        }
-
-        private IEnumerator WaitForMediationCallback()
-        {
-            #if UNITY_EDITOR
-            while (!context.hasClosed) yield return null;
-            yield break;
-            #endif
-            while (!isFocus) yield return null;
-            var wait4CallbackCounter = 0;
-            while (!context.potentiallyCompleted && wait4CallbackCounter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
-            {
-                wait4CallbackCounter++;
-                yield return null;
-            }
-            Log($"[Ad] Waiting for potentially completed callback: {wait4CallbackCounter} frames");
-            
-            if (!context.hasClosed) yield return WaitForAdClosedCallback();
-        }
-
-        private IEnumerator WaitForAdClosedCallback()
-        {
-            int counter = 0;
-            while (!context.hasClosed && counter <= MAX_FRAMES_WAIT_FOR_CALLBACK)
-            {
-                counter++;
-                yield return null;
-            }
-            Log($"[Ad] Waiting for ad closed callback: {counter} frames");
-            if (context.hasClosed) yield break;
-            LogWarning("[Ad] Force close ad (mediation missing OnAdClose callback)");
-            OnAdClosed();
-        }
-
+        }        
+        
         private void ShowAdRoutineCompleted(bool isSuccess)
         {
             if (_loadState == LoadAdsState.Ready)

package/Runtime/Ad/AdShowContext.cs

@@ -35,7 +35,7 @@ namespace Amanotes.Core.Internal
         }
 
         public bool hasFailedOrCancelled => (adCallback & (AdCallback.Fail | AdCallback.Cancel)) != 0;
-        public bool potentiallyCompleted => (adCallback & (AdCallback.Close | AdCallback.Fail | AdCallback.Reward | AdCallback.Cancel)) != 0;
+        public bool potentiallyCompleted => (adCallback & (AdCallback.Close | AdCallback.Fail | AdCallback.Cancel)) != 0;
         public bool hasReward => (adCallback & AdCallback.Reward) != 0;
         public bool hasClosed => (adCallback & AdCallback.Close) != 0;
         public bool hasClicked => (adCallback & AdCallback.Click) != 0;

package/Runtime/AmaGDK.Adapters.cs

@@ -24,7 +24,7 @@ namespace Amanotes.Core.Internal
         [HideInNormalInspector] [SerializeField] internal int initOrder;
         [HideInNormalInspector] [SerializeField] internal bool enabled = true;
         [NonSerialized] internal string adapterId;
-        [NonSerialized] internal string adapterVersion;
+        [NonSerialized] internal string compatibleSDKVersion;
         [NonSerialized] protected internal Status status = Status.None;
         
         protected abstract void Init(Action<bool> onComplete);
@@ -75,7 +75,7 @@ namespace Amanotes.Core.Internal
             }
             
             adapter.adapterId = id;
-            adapter.adapterVersion = version;
+            adapter.compatibleSDKVersion = version;
             GDKUtils.AddUnityCallbacks(adapter);
             adapterMap.Add(id, adapter);
             return true;