com.amanotes.gdk 0.1.12 → 0.1.15

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [0.1.15 - 2023-03-06]
+### Release AmaGDK v0.1.15
+### Fix null exception in VersionExtractor
+### Warn unhandle platform in Appsflyer initialization
+### Allow dev to SetPermittedEvents and SetForbiddenEvents to the adapter config
+
+## [0.1.14 - 2023-03-02]
+### Release AmaGDK v0.1.14
+
+## [0.1.13 - 2023-03-01]
+### Release AmaGDK v0.1.13
+### Fix Semver parser
+
 ## [0.1.12 - 2023-03-01]
 ### Release AmaGDK v0.1.12
 ### Prioritize analytics instant config over the base config

package/Editor/AmaGDKEditor.cs

@@ -185,7 +185,7 @@ namespace Amanotes.Editor
             DrawGUI_AutoInit();
             ToggleGroup("Config", ref showConfigDetail, DrawGUI_ConfigDetail, DrawGUI_ConfigAsset);
             ToggleGroup("Adapters", ref showAdapterInstaller, DrawGUI_AdapterList);
-            ToggleGroup("Example", ref showExampleDetail, DrawGUI_ExampleScene);
+            //("Example", ref showExampleDetail, DrawGUI_ExampleScene);
         }
 
         private static void DrawVersion(string label, string version){

package/Editor/Utils/AmaGDKEditor.ExtractVersion.cs

@@ -50,7 +50,7 @@ namespace Amanotes.Editor
     {
         public static string GDKAdapter(string sdkId)
         {
-            string version = null;
+            string version = "";
             var adapterId = sdkId + "Adapter";
             // Debug.Log($"Searching for AdapterId: {adapterId}");
             List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
@@ -73,12 +73,12 @@ namespace Amanotes.Editor
                     }
                 }
             }
-            return version;
+            return version.Trim();
         }
 
         public static string ThirdParty(string sdkId)
         {
-            string version = null;
+            string version = "";
             switch (sdkId)
             {
                 case FIREBASE_ANALYTICS     : return FirebaseAnalytics();
@@ -95,7 +95,7 @@ namespace Amanotes.Editor
         
         internal static string FirebaseAnalytics()
         {
-            string version = null;
+            string version = "";
             string[] filesFirebase = Directory.GetFiles("Assets", "maven-metadata.xml", SearchOption.AllDirectories);
             if (filesFirebase != null && filesFirebase.Length > 0)
             {
@@ -116,12 +116,12 @@ namespace Amanotes.Editor
                     }
                 }
             }
-            return version;
+            return version.Trim();
         }
 
         internal static string FirebaseRemoteConfig()
         {
-            string version = null;
+            string version = "";
             string[] filesFirebase = Directory.GetFiles("Assets", "maven-metadata.xml", SearchOption.AllDirectories);
             if (filesFirebase != null && filesFirebase.Length > 0)
             {
@@ -142,12 +142,12 @@ namespace Amanotes.Editor
                     }
                 }
             }
-            return version;
+            return version.Trim();
         }
 
         internal static string AppsFlyer()
         {
-            string version = null;
+            string version = "";
             List<Assembly> assemblies = AppDomain.CurrentDomain.GetAssemblies().ToList();
             if (assemblies != null)
             {
@@ -163,12 +163,12 @@ namespace Amanotes.Editor
                 }
             }
 
-            return version;
+            return version.Trim();
         }
 
         internal static string Ironsource()
         {
-            string version = null;
+            string version = "";
             string[] issdk = Directory.GetFiles("Assets", "IronSourceSDKDependencies.xml", System.IO.SearchOption.AllDirectories);
             if (issdk != null && issdk.Length > 0)
             {
@@ -178,14 +178,14 @@ namespace Amanotes.Editor
                 XmlNode dataVersion2 = root2.SelectSingleNode("unityversion");
                 version = dataVersion2.InnerText;
             }
-            return version;
+            return version.Trim();
         }
         
         internal static string RevenueCat()
         {
             string[] files = Directory.GetFiles("Assets", "PurchasesWrapper.java", SearchOption.AllDirectories);
             string searchString = "PLUGIN_VERSION";
-            string version = null;
+            string version = "";
             if (files.Length < 1)
             {
                 return version;
@@ -206,7 +206,7 @@ namespace Amanotes.Editor
                     }
                 }
             }
-            return version;
+            return version.Trim();
         }
     }
 }

package/Runtime/AmaGDK.Analytics.cs

@@ -215,6 +215,24 @@ namespace Amanotes.Core
 
                 localData.UpdateMigrationLog();
             }
+
+            public static void SetPermittedEvents(List<string> eventNames, params string[] adapterIDs)
+            {
+                foreach (var adapterID in adapterIDs)
+                {
+                    var adapter = listAdapters.Find(a => a.id == adapterID)?.GetAdapterApi<IAnalyticAdapter>();
+                    adapter?.SetPermittedEvents(eventNames);
+                }
+            }
+
+            public static void SetForbiddenEvents(List<string> eventNames, params string[] adapterIDs)
+            {
+                foreach (var adapterID in adapterIDs)
+                {                    
+                    var adapter = listAdapters.Find(a => a.id == adapterID)?.GetAdapterApi<IAnalyticAdapter>();
+                    adapter?.SetForbiddenEvents(eventNames);
+                }
+            }
         }
 
         //INTERNAL
@@ -587,5 +605,9 @@ namespace Amanotes.Core.Internal
         void SetUserId(string userId);
 
         void SetUserProperty(string key, string value);
+
+        void SetPermittedEvents(List<string> eventNames);
+
+        void SetForbiddenEvents(List<string> eventNames);
     }
 }

package/Runtime/AmaGDK.Internal.SemVer.cs

@@ -1,12 +1,13 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+using static Amanotes.Core.Internal.Logging;
 
 namespace Amanotes.Core.Internal
 {
     public struct SemVer : IComparable<SemVer>, IComparer<SemVer>
     {
-        public static readonly SemVer ZERO = new SemVer(0,0,0);
+        public static readonly SemVer ZERO = new SemVer(0, 0, 0);
 
         public int major;
         public int minor;
@@ -21,25 +22,30 @@ namespace Amanotes.Core.Internal
 
         public SemVer(string version)
         {
-            if (string.IsNullOrEmpty(version)) {
-                major = 0;
-                minor = 0;
-                patch = 0;
+            major = 0;
+            minor = 0;
+            patch = 0;
+
+            if (string.IsNullOrEmpty(version))
+            {
                 return;
             }
 
+            version = version.Trim();
+
             Regex regex = new Regex(@"^(\d+)\.(\d+)\.(\d+)$");
             Match match = regex.Match(version);
             if (!match.Success)
             {
-                throw new ArgumentException("Invalid SemVer string", "version");
+                LogWarning($"Invalid SemVer string: [{version}]");
+                return;
             }
             major = int.Parse(match.Groups[1].Value);
             minor = int.Parse(match.Groups[2].Value);
             patch = int.Parse(match.Groups[3].Value);
         }
 
-        public bool isValid { get { return this != ZERO; }}
+        public bool isValid { get { return this != ZERO; } }
 
         public override string ToString()
         {

package/Runtime/AmaGDK.WebUtils.cs

@@ -0,0 +1,43 @@
+using System.Collections;
+using UnityEngine.Networking;
+using System;
+using System.Collections.Generic;
+using static Amanotes.Core.Internal.Logging;
+
+namespace Amanotes.Core.Internal
+{
+    internal class WebUtils
+    {
+        public static void PostJson(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
+        {
+            AmaGDK._instance.StartCoroutine(PostJsonCoroutine(url, jsonData, onComplete, headers));
+        }
+
+        static IEnumerator PostJsonCoroutine(string url, string jsonData, Action<bool, string> onComplete = null, Dictionary<string, string> headers = null)
+        {
+            UnityWebRequest webRequest = new UnityWebRequest(url, "POST");
+            if (headers != null)
+            {
+                foreach (KeyValuePair<string, string> kvp in headers)
+                {
+                    webRequest.SetRequestHeader(kvp.Key, kvp.Value);
+                }
+            }
+
+            byte[] bodyRaw = System.Text.Encoding.UTF8.GetBytes(jsonData);
+            webRequest.uploadHandler = new UploadHandlerRaw(bodyRaw);
+            webRequest.downloadHandler = new DownloadHandlerBuffer();
+            yield return webRequest.SendWebRequest();
+
+            if (webRequest.result != UnityWebRequest.Result.Success)
+            {
+                LogWarning("POST request failed: " + webRequest.error);
+                onComplete?.Invoke(false, webRequest.error);
+            }
+            else
+            {
+                onComplete?.Invoke(true, webRequest.downloadHandler.text);
+            }
+        }
+    }
+}

package/Runtime/AmaGDK.WebUtils.cs.meta

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

package/Runtime/AmaGDK.cs

@@ -12,7 +12,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.1.12";
+        public const string VERSION = "0.1.15";
 
         internal static AmaGDK _instance;
         internal static event Action _frameUpdate;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.1.12",
+    "version": "0.1.15",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2020.3",