com.azerion.bluestack 3.1.5 → 3.1.6

package/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Changelog
 
+## [3.1.6] - 2024-07-26
+
+### Changed
+- BlueStack Android SDK version upgraded to 4.4.0
+
+### Added
+- Manage Android mediation networks from the BlueStack Settings
+
 ## [3.1.5] - 2024-07-10
 
 ### Added
-- Method added to refresh Banner in the editor
+- Method added to refresh Banner in the unity editor
 - Native ad Close method added to trigger OnNativeAdClosed event in the editor
 
 ### Changed
@@ -13,7 +21,7 @@
 ### Fixed
 - Fixed the BlueStack Settings null exception issue when no settings exist
 - Fixed the issue with saving AdMob App ids
-- Error handled in Native ads, in case of null or empty image urls.
+- Error handled in Native ads, in case of null or empty image urls
 
 ## [3.1.4] - 2024-07-04
 

package/Editor/Android/AndroidDependencyModifier.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
+using UnityEditor;
 using UnityEngine;
 
 namespace Azerion.BlueStack.Editor.Android
@@ -10,7 +11,64 @@ namespace Azerion.BlueStack.Editor.Android
     {
         void IDependencyModifier.modifyDependencies(string xmlFilePath, List<MediationNetworkDependency> dependencies)
         {
+            XmlDocument xmlDoc = new XmlDocument();
 
+            try
+            {
+                xmlDoc.Load(xmlFilePath);
+            }
+            catch (IOException e)
+            {
+                throw new Exception("Unable to load xml, error: " + e.Message);
+            }
+
+            XmlNode androidPackages = xmlDoc.SelectSingleNode($"//dependencies/androidPackages");
+            if (androidPackages == null)
+            {
+                Debug.LogError("No node with the name 'androidPackages' found in the xml");
+                return;
+            }
+            
+            // Remove all networks from the packages node
+            // androidPackages.RemoveAll();
+            
+            // Add/remove networks
+            foreach (MediationNetworkDependency dependency in dependencies)
+            {
+                XmlNode packageNode = androidPackages.SelectSingleNode(
+                        $"//androidPackage[@spec='{dependency.Package}']");
+                
+                if (packageNode != null)
+                {
+                    // Remove inactive network
+                    if (!dependency.Active)
+                    {
+                        androidPackages.RemoveChild(packageNode);
+                    }
+                    // else keep it
+                }
+                else
+                {
+                    // Add new active network
+                    if (dependency.Active)
+                    {
+                        XmlElement package = xmlDoc.CreateElement("androidPackage");
+                        package.SetAttribute("spec", dependency.Package);
+                        if (dependency.Repositories != null)
+                        {
+                            XmlNode repositories = xmlDoc.ImportNode(dependency.Repositories, true);
+                            package.AppendChild(repositories);
+                        }
+                        androidPackages.AppendChild(package);
+                    }
+                }
+            }
+
+            // Replace main dependency XML content with the updated XML
+            System.IO.File.WriteAllText(xmlFilePath, xmlDoc.OuterXml);
+            AssetDatabase.Refresh();
+            
+            // Debug.Log("Mediation Dependencies are updated successfully in Main Dependencies XML.");
         }
 
         void IDependencyModifier.modifyMediationNetworkDependencies(string xmlFilePath,

package/Editor/Android/AndroidDependencyParser.cs

@@ -20,7 +20,6 @@ namespace Azerion.BlueStack.Editor.Android
                 if (specAttribute == null) continue;
                 dependencies.Add(new AndroidDependency(specAttribute.Value, "", ""));
             }
-
             return dependencies;
         }
 
@@ -37,15 +36,17 @@ namespace Azerion.BlueStack.Editor.Android
                 var nameAttribute = androidPackageNode.Attributes?["name"];
                 var packageAttribute = androidPackageNode.Attributes?["package"];
                 var activeAttribute = androidPackageNode.Attributes?["active"];
+                var repositoriesNode = androidPackageNode.SelectSingleNode("repositories");
                 if (nameAttribute == null || packageAttribute == null) continue;
 
                 var name = nameAttribute.Value;
                 var package = packageAttribute.Value;
-                var active = bool.Parse(activeAttribute.Value);
+                var active = activeAttribute != null && bool.Parse(activeAttribute.Value);
 
-                dependencies.Add(new MediationNetworkDependency(name, package, active));
+                dependencies.Add(repositoriesNode != null
+                    ? new MediationNetworkDependency(name, package, active, repositoriesNode)
+                    : new MediationNetworkDependency(name, package, active));
             }
-
             return dependencies;
         }
     }

package/Editor/Android/Gradle/mainTemplate.gradle

@@ -5,7 +5,7 @@ apply plugin: 'com.android.library'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.madvertise:bluestack-core-sdk:4.2.0'
+    implementation 'com.madvertise:bluestack-core-sdk:4.4.0'
 **DEPS**}
 
 android {

package/Editor/Android/ManifestProcessor.cs

@@ -40,7 +40,7 @@ namespace Azerion.BlueStack.Editor.Android
             }
             catch (IOException e)
             {
-                StopBuildWithMessage(MANIFEST_FILE_MISSING);
+                StopBuildWithMessage(MANIFEST_FILE_MISSING +" : " + e.Message );
             }
 
             XElement elemManifest = manifest.Element("manifest");

package/Editor/BlueStackDependencies.xml

@@ -1,6 +1,10 @@
 <dependencies>
     <androidPackages>
-        <androidPackage spec="com.azerion:bluestack-sdk-core:4.3.2"/>
+        <androidPackage spec="com.azerion:bluestack-sdk-core:4.4.0">
+            <repositories>
+                <repository>https://packagecloud.io/smartadserver/android/maven2</repository>
+            </repositories>
+        </androidPackage>
     </androidPackages>
     <iosPods>
         <iosPod name="BlueStack-SDK" version="4.4.6" bitcodeEnabled="false" addToAllTargets="false" subspecs="[]"/>

package/Editor/BlueStackMediationNetworks.xml

@@ -0,0 +1,31 @@
+<networkList>
+    <androidNetworks>
+        <network name="Criteo In-App Bidding" package="com.azerion:bluestack-mediation-criteo:4.4.0.0" active="true"/>
+        <network name="AdColony" package="com.azerion:bluestack-mediation-adcolony:4.4.0.0" active="true"/>
+        <network name="Huawei" package="com.azerion:bluestack-mediation-huawei:4.4.0.0" active="true">
+            <repositories>
+                <repository>https://developer.huawei.com/repo/</repository>
+            </repositories>
+        </network>
+        <network name="GAM / AdMob" package="com.azerion:bluestack-mediation-gma:4.4.0.0" active="true"/>
+        <network name="In-App Bidding" package="com.azerion:bluestack-mediation-bidding:4.4.0.0" active="true">
+            <repositories>
+                <repository>https://packagecloud.io/smartadserver/android/maven2</repository>
+            </repositories>
+        </network>
+        <network name="Smart Display / Equativ" package="com.azerion:bluestack-mediation-smartadserver:4.4.0.0" active="true">
+            <repositories>
+                <repository>https://packagecloud.io/smartadserver/android/maven2</repository>
+            </repositories>
+        </network>
+        <network name="Ogury" package="com.azerion:bluestack-mediation-ogury:4.4.0.0" active="true">
+            <repositories>
+                <repository>https://maven.ogury.co/</repository>
+            </repositories>
+        </network>
+    </androidNetworks>
+    <iosNetworks>
+        <network name="AdMob" package="Google-Mobile-Ads-SDK" active="true"/>
+        <network name="Smart Display" package="Smart-Display-SDK" active="true"/>
+    </iosNetworks>
+</networkList>

package/Editor/BlueStackSettings.cs

@@ -31,6 +31,13 @@ namespace Azerion.BlueStack.Editor
             get => Instance.iOSMediationNetworks ?? new List<MediationNetworkDependency>();
             set => Instance.iOSMediationNetworks = value;
         }
+        
+        [SerializeField] private List<MediationNetworkDependency> androidMediationNetworks;
+        public List<MediationNetworkDependency> AndroidMediationNetworks
+        {
+            get => Instance.androidMediationNetworks ?? new List<MediationNetworkDependency>();
+            set => Instance.androidMediationNetworks = value;
+        }
 
         public static BlueStackSettings Instance
         {

package/Editor/BlueStackSettingsEditor.cs

@@ -16,9 +16,7 @@ namespace Azerion.BlueStack.Editor
         private const string BlueStackSettingsResDir = "Assets/Resources";
         private const string BlueStackSettingsFile = "BlueStackSettings";
         private const string BlueStackSettingsFileExtension = ".asset";
-
-        private List<bool> iOSMediationNetworkList = new List<bool>();
-        private List<bool> AndroidMediationNetworkList = new List<bool>();
+        
         SerializedProperty iOSMediationNetworkListProperty;
         SerializedProperty androidMediationNetworkListProperty;
 
@@ -26,7 +24,8 @@ namespace Azerion.BlueStack.Editor
         SerializedProperty androidAdmobAppIdProperty;
 
         public static event EventHandler<List<MediationNetworkDependency>> onIOSMediationNetworksUpdateEvent;
-        public static int someint = 12;
+        public static event EventHandler<List<MediationNetworkDependency>> onAndroidMediationNetworksUpdateEvent;
+
         [MenuItem("Azerion/BlueStack/Settings")]
         public static void OpenInspector()
         {
@@ -41,7 +40,7 @@ namespace Azerion.BlueStack.Editor
         {
             if (BlueStackSettings.Instance == null)
             {
-                try 
+                try
                 {
                     Directory.CreateDirectory(BlueStackSettingsResDir);
                     BlueStackSettings.Instance = ScriptableObject.CreateInstance<BlueStackSettings>();
@@ -49,8 +48,8 @@ namespace Azerion.BlueStack.Editor
                     string assetPath = Path.Combine(BlueStackSettingsResDir, BlueStackSettingsFile);
                     string assetPathWithExtension = Path.ChangeExtension(assetPath, BlueStackSettingsFileExtension);
                     AssetDatabase.CreateAsset(BlueStackSettings.Instance, assetPathWithExtension);
-                    AssetDatabase.SaveAssets();   
-                    
+                    AssetDatabase.SaveAssets();
+
                     return true;
                 }
                 catch (Exception e)
@@ -83,25 +82,29 @@ namespace Azerion.BlueStack.Editor
 
         static void Initialize()
         {
+            Debug.LogWarning("BlueStackSettings Initialize");
+            
             if (!DoesBlueStackSettingsExist()) return;
             
             BlueStackSettings.Instance.IOSMediationNetworks.Clear();
-            
-            // Sync/Copy base mediation dependency xml file from Package to Assets directory 
-            DependencyProvider.SyncMediationDependencies();
+            BlueStackSettings.Instance.AndroidMediationNetworks.Clear();
 
-            var iOSMediationNetworkDependencies = DependencyProvider.GetAllMediationNetworkDependencies(new IOSDependencyParser());
+            // Sync/Copy base mediation dependency xml file from Package to Assets directory 
+            DependencyProvider.SyncDependenciesXMLs();
 
-            // BlueStackSettings.Instance.IOSMediationNetworks = BlueStackSettings.Instance.IOSMediationNetworks
-            //     .Where(x => iOSMediationNetworkDependencies.All(l2 => l2.Name != x.Name)).ToList();
+            var iOSMediationNetworkDependencies = DependencyProvider.GetMediationNetworkDependenciesFromAsset(new IOSDependencyParser());
+            var androidMediationNetworkDependencies = DependencyProvider.GetMediationNetworkDependenciesFromAsset(new AndroidDependencyParser());
 
-            BlueStackSettings.Instance.IOSMediationNetworks =
-                BlueStackSettings.Instance.IOSMediationNetworks.Union(iOSMediationNetworkDependencies).ToList();
+            BlueStackSettings.Instance.AndroidMediationNetworks = androidMediationNetworkDependencies;
+            BlueStackSettings.Instance.IOSMediationNetworks = iOSMediationNetworkDependencies;
 
+            DependencyProvider.UpdateMediationNetworkDependencies(new AndroidDependencyModifier(),
+                BlueStackSettings.Instance.AndroidMediationNetworks);
             DependencyProvider.UpdateMediationNetworkDependencies(new IOSDependencyModifier(),
                 BlueStackSettings.Instance.IOSMediationNetworks);
+
         }
-        
+
         public override void OnInspectorGUI()
         {
             EditorGUI.BeginChangeCheck();
@@ -109,12 +112,14 @@ namespace Azerion.BlueStack.Editor
 
             iOSAdmobAppIdProperty = serializedObject.FindProperty("admobAppIdIOS");
             androidAdmobAppIdProperty = serializedObject.FindProperty("admobAppIdAndroid");
-            
+
             EditorGUILayout.PropertyField(iOSAdmobAppIdProperty, new GUIContent("Admob AppId IOS: "));
             EditorGUILayout.PropertyField(androidAdmobAppIdProperty, new GUIContent("Admob AppId Android: "));
+
+            // iOS Mediation Networks
             EditorGUILayout.Separator();
             EditorGUILayout.LabelField("iOS Mediation Networks: ", EditorStyles.boldLabel);
-            
+
             foreach (var dependency in BlueStackSettings.Instance.IOSMediationNetworks)
             {
                 // dependency.Print();
@@ -124,17 +129,35 @@ namespace Azerion.BlueStack.Editor
                     dependency.Active = newAutomaticConfigurationFilesUpdate;
                 }
             }
-            
+
+            // Android Mediation Networks
+            EditorGUILayout.Separator();
+            EditorGUILayout.LabelField("Android Mediation Networks: ", EditorStyles.boldLabel);
+
+            foreach (var dependency in BlueStackSettings.Instance.AndroidMediationNetworks)
+            {
+                // dependency.Print();
+                bool newAutomaticConfigurationFilesUpdate = GUILayout.Toggle(dependency.Active, dependency.Name);
+                if (newAutomaticConfigurationFilesUpdate != dependency.Active)
+                {
+                    dependency.Active = newAutomaticConfigurationFilesUpdate;
+                }
+            }
+
             if (EditorGUI.EndChangeCheck())
             {
-                Debug.LogWarning("EditorGUI Changed");
+                // TODO: Before triggering the event check if any change occured in the list 
                 onIOSMediationNetworksUpdateEvent?.Invoke(this, BlueStackSettings.Instance.IOSMediationNetworks);
-                
+                onAndroidMediationNetworksUpdateEvent?.Invoke(this, BlueStackSettings.Instance.AndroidMediationNetworks);
+
                 DependencyProvider.UpdateMediationNetworkDependencies(new IOSDependencyModifier(),
                     BlueStackSettings.Instance.IOSMediationNetworks);
+                DependencyProvider.UpdateMediationNetworkDependencies(new AndroidDependencyModifier(),
+                    BlueStackSettings.Instance.AndroidMediationNetworks);
+
                 serializedObject.ApplyModifiedProperties();
             }
-            
+
         }
     }
 }

package/Editor/DependencyProvider.cs

@@ -12,13 +12,13 @@ namespace Azerion.BlueStack.Editor
             "Packages/com.azerion.bluestack/Editor/" + "BlueStackDependencies.xml";
 
         private static readonly string _mediationDependencyPathInPackage =
-            "Packages/com.azerion.bluestack/Editor/" + "BlueStackMediationDependencies.xml";
+            "Packages/com.azerion.bluestack/Editor/" + "BlueStackMediationNetworks.xml";
 
         private static readonly string _editorPathInAssets = "Assets/Editor/";
         private static readonly string _dependencyPathInAssets = _editorPathInAssets + "BlueStackDependencies.xml";
 
         private static readonly string _mediationDependencyPathInAssets =
-            _editorPathInAssets + "BlueStackMediationDependencies.xml";
+            _editorPathInAssets + "BlueStackMediationNetworks.xml";
 
         public static List<Dependency> GetAllDependencies(IDependencyParser parser)
         {
@@ -33,23 +33,21 @@ namespace Azerion.BlueStack.Editor
             }
         }
 
-        public static List<MediationNetworkDependency> GetAllMediationNetworkDependencies(IDependencyParser parser)
+        public static List<MediationNetworkDependency> GetMediationNetworkDependenciesFromAsset(IDependencyParser parser)
         {
             if (File.Exists(_mediationDependencyPathInAssets))
             {
                 return parser.parseMediationNetworkDependencies(_mediationDependencyPathInAssets);
             }
-            else
-            {
-                Debug.LogError("Dependencies file not found at: " + _mediationDependencyPathInAssets);
-                return new List<MediationNetworkDependency>();
-            }
+
+            Debug.LogError("Dependencies file not found at: " + _mediationDependencyPathInAssets);
+            return new List<MediationNetworkDependency>();
         }
 
         public static void UpdateMediationNetworkDependencies(IDependencyModifier modifier,
             List<MediationNetworkDependency> dependencies)
         {
-            // Update Mediation Network Dependencies in BlueStackMediationDependencies.xml
+            // Update Mediation Network Dependencies in BlueStackMediationNetworks.xml
             if (File.Exists(_mediationDependencyPathInAssets))
             {
                 modifier.modifyMediationNetworkDependencies(_mediationDependencyPathInAssets, dependencies);
@@ -70,7 +68,7 @@ namespace Azerion.BlueStack.Editor
             }
         }
 
-        public static void SyncMediationDependencies()
+        public static void SyncDependenciesXMLs()
         {
             // Copy from the source
             CopyDependenciesXMLFileToAssets();
@@ -159,7 +157,7 @@ namespace Azerion.BlueStack.Editor
 
             // Save the modified XML
             SaveMainXMLFile(mainDependencyXML.OuterXml);
-
+            
             Debug.Log("Mediation Dependency XML files merged and updated successfully.");
         }
 
@@ -190,6 +188,7 @@ namespace Azerion.BlueStack.Editor
 
         private static void CopyDependenciesXMLFileToAssets()
         {
+            Debug.LogWarning("CopyDependenciesXMLFileToAssets - ");
             Directory.CreateDirectory(_editorPathInAssets);
             FileUtil.ReplaceFile(_dependencyPathInPackage, _dependencyPathInAssets);
             AssetDatabase.Refresh();
@@ -197,6 +196,13 @@ namespace Azerion.BlueStack.Editor
 
         private static bool CopyMediationDependenciesXMLFileToAssets()
         {
+            // Delete previous BlueStackMediationDependencies.xml file - TODO: remove in future 
+            if (File.Exists(_editorPathInAssets + "BlueStackMediationDependencies.xml"))
+            {
+                FileUtil.DeleteFileOrDirectory(_editorPathInAssets + "BlueStackMediationDependencies.xml");
+                AssetDatabase.Refresh();
+            }
+
             if (!File.Exists(_mediationDependencyPathInAssets))
             {
                 Directory.CreateDirectory(_editorPathInAssets);

package/Editor/MediationNetworkDependency.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Xml;
 using UnityEngine;
 
 namespace Azerion.BlueStack.Editor
@@ -6,20 +7,22 @@ namespace Azerion.BlueStack.Editor
     [Serializable]
     public class MediationNetworkDependency
     {
-        public MediationNetworkDependency(string name, string package, bool active)
+        public MediationNetworkDependency(string name, string package, bool active, XmlNode repositories = null)
         {
             Name = name;
             Package = package;
             Active = active;
+            Repositories = repositories;
         }
 
         public string Name { get; set; }
         public string Package { get; set; }
         public bool Active { get; set; }
+        public XmlNode Repositories { get; set; }
 
         public void Print()
         {
-            Debug.Log("Name: " + Name + "Package: " + Package + "Active: " + Active);
+            Debug.Log("Name: " + Name + "Package: " + Package + "Active: " + Active + "\nRepositories: " + Repositories.ToString());
         }
     }
 }

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "com.azerion.bluestack",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "displayName": "BlueStack",
   "description": "BlueStack SDK has been designed to give developers options for showing Ads from different ad networks.",
   "unity": "2020.3",
   "documentationUrl": "https://developers.bluestack.app/unity",
   "changelogUrl": "https://developers.bluestack.app/unity/changelog",
   "dependencies": {
-    "com.google.external-dependency-manager": "1.2.178"
+    "com.google.external-dependency-manager": "1.2.181"
   },
   "author": {
     "name": "BlueStack",

package/Editor/BlueStackMediationDependencies.xml

@@ -1,8 +0,0 @@
-<networkList>
-    <androidNetworks>
-    </androidNetworks>
-    <iosNetworks>
-        <network name="AdMob" package="Google-Mobile-Ads-SDK" active="true"/>
-        <network name="Smart Display" package="Smart-Display-SDK" active="true"/>
-    </iosNetworks>
-</networkList>