com.azerion.bluestack 3.4.1 → 6.0.0-beta.1

package/Editor/BlueStackVersionExporter.cs

@@ -0,0 +1,214 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using UnityEditor;
+using UnityEditor.Build;
+using UnityEditor.Build.Reporting;
+using UnityEditor.PackageManager;
+using UnityEngine;
+using PackageInfo = UnityEditor.PackageManager.PackageInfo;
+
+namespace Azerion.BlueStack.Editor
+{
+    /// <summary>
+    /// Keeps the package version declared in <c>package.json</c> mirrored into,
+    ///   • <c>Runtime/Common/BlueStackSdkInfo.cs</c>
+    ///   • <c>BlueStackDependenciesSource.xml</c>
+    /// </summary>
+    [InitializeOnLoad]
+    public static class BlueStackVersionExporter
+    {
+        internal const string DependenciesVersionPattern = "(<dependencies\\b[^>]*?\\bversion=\")([^\"]*)(\")";
+
+        private static string _packageJsonPath;
+        private static DateTime _lastStamp;
+
+        static BlueStackVersionExporter()
+        {
+            Export();
+            EditorApplication.update += PollForPackageJsonChange;
+        }
+
+        // Cheap mtime check; only does real work when package.json actually changes on disk.
+        private static void PollForPackageJsonChange()
+        {
+            if (string.IsNullOrEmpty(_packageJsonPath) || !File.Exists(_packageJsonPath))
+            {
+                return;
+            }
+
+            var stamp = File.GetLastWriteTimeUtc(_packageJsonPath);
+            if (stamp == _lastStamp)
+            {
+                return;
+            }
+
+            _lastStamp = stamp;
+            Debug.Log("[BSU sync] package.json changed -> regenerating version files");
+            Export();
+        }
+
+        private static void Export()
+        {
+            var packageInfo = PackageInfo.FindForAssembly(typeof(BlueStackVersionExporter).Assembly);
+            if (packageInfo == null)
+            {
+                return;
+            }
+
+            // Never write into a read-only install (registry / git / embedded-in-cache).
+            if (packageInfo.source != PackageSource.Local && packageInfo.source != PackageSource.Embedded)
+            {
+                return;
+            }
+
+            _packageJsonPath = Path.Combine(packageInfo.resolvedPath, "package.json");
+
+            // Read the version straight from disk — independent of when the Package Manager re-resolves.
+            var version = ReadPackageJsonVersion(_packageJsonPath);
+            if (string.IsNullOrEmpty(version))
+            {
+                return;
+            }
+
+            // Remember the current mtime so the poller doesn't re-fire on the next domain reload.
+            _lastStamp = File.GetLastWriteTimeUtc(_packageJsonPath);
+
+            var changed = SyncDependenciesVersion(packageInfo.resolvedPath, version);
+            changed |= SyncSdkInfo(packageInfo.resolvedPath, version);
+
+            if (changed)
+            {
+                AssetDatabase.Refresh();
+                Debug.Log($"[BSU sync] version files updated to {version}");
+            }
+        }
+
+        internal static string ReadPackageJsonVersion(string packageJsonPath)
+        {
+            if (!File.Exists(packageJsonPath))
+            {
+                return null;
+            }
+
+            try
+            {
+                var manifest = JsonUtility.FromJson<PackageManifest>(File.ReadAllText(packageJsonPath));
+                return manifest != null ? manifest.version : null;
+            }
+            catch (Exception e)
+            {
+                Debug.LogWarning($"[BSU sync] Could not parse {packageJsonPath}: {e.Message}");
+                return null;
+            }
+        }
+
+        // Returns true if the file was rewritten.
+        private static bool SyncSdkInfo(string resolvedPath, string version)
+        {
+            var outputFile = Path.Combine(resolvedPath, "Runtime", "Common", "BlueStackSdkInfo.cs");
+            var content = BuildSdkInfoContent(version);
+
+            if (File.Exists(outputFile) && File.ReadAllText(outputFile) == content)
+            {
+                return false;
+            }
+
+            File.WriteAllText(outputFile, content);
+            return true;
+        }
+
+        // Returns true if the file was rewritten. Touches ONLY the root <dependencies version="…">.
+        internal static bool SyncDependenciesVersion(string resolvedPath, string version)
+        {
+            var xmlFile = Path.Combine(resolvedPath, "Editor", "BlueStackDependenciesSource.xml");
+            if (!File.Exists(xmlFile))
+            {
+                return false;
+            }
+
+            var xml = File.ReadAllText(xmlFile);
+            var match = Regex.Match(xml, DependenciesVersionPattern);
+            if (!match.Success)
+            {
+                Debug.LogWarning(
+                    $"[BSU sync] No <dependencies version=\"...\"> attribute found in {xmlFile}; skipping version sync.");
+                return false;
+            }
+
+            if (match.Groups[2].Value == version)
+            {
+                return false;
+            }
+
+            var updated = Regex.Replace(xml, DependenciesVersionPattern, "${1}" + version + "${3}");
+            File.WriteAllText(xmlFile, updated);
+            return true;
+        }
+
+        // Explicit "\n" keeps output byte-identical across platforms so the write-if-changed check holds.
+        private static string BuildSdkInfoContent(string version)
+        {
+            return
+                "// <auto-generated>\n" +
+                "// Generated by BlueStackVersionExporter from package.json. Do not edit by hand.\n" +
+                "// </auto-generated>\n" +
+                "namespace Azerion.BlueStack.Common\n" +
+                "{\n" +
+                "    public static class BlueStackSdkInfo\n" +
+                "    {\n" +
+                "        public const string Version = \"" + version + "\";\n" +
+                "    }\n" +
+                "}\n";
+        }
+
+        [Serializable]
+        private class PackageManifest
+        {
+            public string version;
+        }
+    }
+
+    /// <summary>
+    /// Build time validation, check that the version number in <c>BlueStackSdkInfo</c> and
+    /// <c>BlueStackDependenciesSource.xml</c> matches <c>package.json</c>
+    /// </summary>
+    public class BlueStackVersionBuildGate : IPreprocessBuildWithReport
+    {
+        public int callbackOrder => 0;
+
+        public void OnPreprocessBuild(BuildReport report)
+        {
+            var packageInfo = PackageInfo.FindForAssembly(typeof(BlueStackVersionBuildGate).Assembly);
+            if (packageInfo == null)
+            {
+                throw new BuildFailedException("[BlueStack] PackageInfo not found in package.json");
+            }
+
+            var version = BlueStackVersionExporter.ReadPackageJsonVersion(
+                Path.Combine(packageInfo.resolvedPath, "package.json"));
+            if (string.IsNullOrEmpty(version))
+            {
+                throw new BuildFailedException("[BlueStack] Unable to retrieve the version number from package.json");
+            }
+
+            // The XML is consumed at build/resolve time and isn't compiled — safe to rewrite in a mutable install.
+            if (packageInfo.source == PackageSource.Local || packageInfo.source == PackageSource.Embedded)
+            {
+                BlueStackVersionExporter.SyncDependenciesVersion(packageInfo.resolvedPath, version);
+            }
+
+            var sdkInfoPath = Path.Combine(packageInfo.resolvedPath, "Runtime", "Common", "BlueStackSdkInfo.cs");
+            var committed = File.Exists(sdkInfoPath)
+                ? Regex.Match(File.ReadAllText(sdkInfoPath), "Version\\s*=\\s*\"([^\"]+)\"").Groups[1].Value
+                : null;
+
+            if (committed != version)
+            {
+                throw new BuildFailedException(
+                    $"[BlueStack] BlueStackSdkInfo.Version ('{committed}') is out of sync with package.json ('{version}'). " +
+                    "Open the project in the Unity Editor so the version is regenerated, then rebuild.");
+            }
+        }
+    }
+}

package/Editor/BlueStackVersionExporter.cs.meta

@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f5a0a4fcd47804487b8e298158c0ce02

package/Editor/Prefabs/AdPrefabs/Banners/Banner.prefab

@@ -31,12 +31,12 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 224975965904302652}
+  m_Father: {fileID: 9100000000000002}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 87.5}
-  m_SizeDelta: {x: 1120, y: 175}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222746751799034550
 CanvasRenderer:
@@ -56,8 +56,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_Material: {fileID: 0}
   m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
@@ -86,8 +86,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_Navigation:
     m_Mode: 3
     m_WrapAround: 0
@@ -148,17 +148,17 @@ RectTransform:
   m_GameObject: {fileID: 1922916089534430}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 224102598220924924}
+  - {fileID: 9100000000000002}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!223 &223151453590684250
 Canvas:
   m_ObjectHideFlags: 0
@@ -192,8 +192,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_IgnoreReversedGraphics: 1
   m_BlockingObjects: 0
   m_BlockingMask:
@@ -209,8 +209,8 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  m_Name:
+  m_EditorClassIdentifier:
   m_UiScaleMode: 1
   m_ReferencePixelsPerUnit: 100
   m_ScaleFactor: 1
@@ -222,3 +222,39 @@ MonoBehaviour:
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
   m_PresetInfoIsWorld: 0
+--- !u!1 &9100000000000001
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9100000000000002}
+  m_Layer: 5
+  m_Name: BannerContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9100000000000002
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9100000000000001}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 224102598220924924}
+  m_Father: {fileID: 224975965904302652}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 75}
+  m_SizeDelta: {x: 960, y: 150}
+  m_Pivot: {x: 0.5, y: 0.5}

package/Editor/Prefabs/AdPrefabs/Banners/DynamicBanner.prefab

@@ -33,12 +33,12 @@ RectTransform:
   m_Children:
   - {fileID: 224233332446998570}
   - {fileID: 2527966602407694077}
-  m_Father: {fileID: 224156852809508418}
+  m_Father: {fileID: 9200000000000002}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0.5, y: 0}
-  m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 87.5}
-  m_SizeDelta: {x: 1440, y: 175}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222779771472130718
 CanvasRenderer:
@@ -156,7 +156,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 80}
+  m_AnchoredPosition: {x: 0, y: 75}
   m_SizeDelta: {x: 400, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &222910655472497136
@@ -229,17 +229,17 @@ RectTransform:
   m_GameObject: {fileID: 1853606194061450}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 224490741999108352}
+  - {fileID: 9200000000000002}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
-  m_Pivot: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!223 &223985404539061306
 Canvas:
   m_ObjectHideFlags: 0
@@ -258,6 +258,7 @@ Canvas:
   m_OverridePixelPerfect: 0
   m_SortingBucketNormalizedSize: 0
   m_VertexColorAlwaysGammaSpace: 0
+  m_UseReflectionProbes: 0
   m_AdditionalShaderChannelsFlag: 0
   m_UpdateRectTransformForStandalone: 0
   m_SortingLayerID: 0
@@ -303,6 +304,42 @@ MonoBehaviour:
   m_DefaultSpriteDPI: 96
   m_DynamicPixelsPerUnit: 1
   m_PresetInfoIsWorld: 0
+--- !u!1 &9200000000000001
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9200000000000002}
+  m_Layer: 5
+  m_Name: BannerContainer
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9200000000000002
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9200000000000001}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 224490741999108352}
+  m_Father: {fileID: 224156852809508418}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 75}
+  m_SizeDelta: {x: 1284, y: 150}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8708767047278081169
 GameObject:
   m_ObjectHideFlags: 0
@@ -328,7 +365,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8708767047278081169}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -337,7 +374,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -40}
+  m_AnchoredPosition: {x: 0, y: -30}
   m_SizeDelta: {x: 260, y: 37}
   m_Pivot: {x: 0.5, y: 1}
 --- !u!222 &754689629187967066