com.amanotes.gdk 0.2.66-7 → 0.2.66-8

package/Editor/Extra/GDKCIBuildCommand.cs

@@ -1,10 +1,12 @@
 using UnityEditor;
 using System.Linq;
 using System;
+using System.Diagnostics;
 using System.IO;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
+using Debug = UnityEngine.Debug;
 
 namespace Amanotes.Core
 {
@@ -15,11 +17,65 @@ namespace Amanotes.Core
         private const string KEY_ALIAS_NAME = "KEY_ALIAS_NAME";
         private const string KEYSTORE = "keystore.keystore";
         private const string BUILD_OPTIONS_ENV_VAR = "BuildOptions";
-        private const string ANDROID_BUNDLE_VERSION_CODE = "VERSION_BUILD_VAR";
         private const string ANDROID_APP_BUNDLE = "BUILD_APP_BUNDLE";
         private const string SCRIPTING_BACKEND_ENV_VAR = "SCRIPTING_BACKEND";
+        private const string EXPORT_ANDROID_PROJECT = "EXPORT_ANDROID_PROJECT";
         private const string VERSION_NUMBER_VAR = "VERSION_NUMBER_VAR";
-        private const string VERSION_iOS = "VERSION_BUILD_VAR";
+        private const string VERSION_BUILD_VAR = "VERSION_BUILD_VAR";
+        
+        public static void InstallPod(EventHandler processExit, string buildPath = null)
+        {
+            try
+            {
+                string arguments = "";
+                if (Application.isBatchMode && TryGetEnv("CI_SCRIPT_DIR", out string scriptDir))
+                {
+                    arguments = $"{scriptDir}/utils.sh pod-install";
+                }
+                else if (!Application.isBatchMode)
+                {
+                    string podPath = "/usr/local/bin/pod";
+                    if (!File.Exists(podPath)) podPath = "/opt/homebrew/bin/pod";
+                    arguments = $"-c \"{podPath} install --project-directory={buildPath}\"";
+                }
+                
+                // Configure process start info
+                var startInfo = new ProcessStartInfo
+                {
+                    FileName = "/bin/zsh",
+                    Arguments = arguments,
+                    CreateNoWindow = false,
+                    RedirectStandardOutput = true,
+                    RedirectStandardError = true,
+                    UseShellExecute = false
+                };
+
+                var proc = new Process
+                {
+                    StartInfo = startInfo,
+                    EnableRaisingEvents = true
+                };
+
+                // Attach event handlers
+                proc.OutputDataReceived += (sender, args) =>
+                {
+                    if (args.Data == null) return; // End of the stream
+                    Debug.Log(args.Data);
+                };
+
+                proc.Exited += processExit;
+
+                // Start the process
+                proc.Start();
+                proc.BeginOutputReadLine();
+                proc.BeginErrorReadLine();
+                proc.WaitForExit();
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
+        }
 
         static string GetArgument(string name)
         {
@@ -185,21 +241,19 @@ namespace Amanotes.Core
             var buildTarget = GetBuildTarget();
 
             Console.WriteLine(":: Performing build");
-            if (TryGetEnv(VERSION_NUMBER_VAR, out var bundleVersionNumber))
+            if (TryGetEnv(VERSION_NUMBER_VAR, out string bundleVersionNumber))
             {
-                if (buildTarget == BuildTarget.iOS)
-                {
-                    bundleVersionNumber = GetIosVersion();
-                }
                 Console.WriteLine($":: Setting bundleVersionNumber to '{bundleVersionNumber}' (Length: {bundleVersionNumber.Length})");
                 PlayerSettings.bundleVersion = bundleVersionNumber;
             }
+            HandleBuildNumber(buildTarget);
 
             if (buildTarget == BuildTarget.Android)
             {
                 HandleAndroidAppBundle();
-                HandleAndroidBundleVersionCode();
                 HandleAndroidKeystore();
+                HandleDebugSymbols();
+                HandleExportAndroidProject();
             }
 
             var buildPath = GetBuildPath();
@@ -214,6 +268,7 @@ namespace Amanotes.Core
             if (buildReport.summary.result != UnityEditor.Build.Reporting.BuildResult.Succeeded)
                 throw new Exception($"Build ended with {buildReport.summary.result} status");
 
+            BuildMetadata.Save(buildPath, buildTarget);
             Console.WriteLine(":: Done with build");
         }
 
@@ -237,34 +292,34 @@ namespace Amanotes.Core
             }
         }
 
-        private static void HandleAndroidBundleVersionCode()
+        private static void HandleBuildNumber(BuildTarget buildTarget)
         {
-            if (TryGetEnv(ANDROID_BUNDLE_VERSION_CODE, out string value))
+            if (!TryGetEnv(VERSION_BUILD_VAR, out string value)) return;
+            if (int.TryParse(value, out int version))
             {
-                if (int.TryParse(value, out int version))
+                if (buildTarget == BuildTarget.Android)
                 {
-                    PlayerSettings.Android.bundleVersionCode = version;
-                    Console.WriteLine($":: {ANDROID_BUNDLE_VERSION_CODE} env var detected, set the bundle version code to {value}.");
+                    PlayerSettings.Android.bundleVersionCode = version;    
                 }
-                else
-                    Console.WriteLine($":: {ANDROID_BUNDLE_VERSION_CODE} env var detected but the version value \"{value}\" is not an integer.");
+                else if (buildTarget == BuildTarget.iOS)
+                {
+                    PlayerSettings.iOS.buildNumber = version.ToString();
+                }
+                    
+                Console.WriteLine($":: {VERSION_BUILD_VAR} env var detected, set the bundle version code to {value}.");
             }
+            else
+                Console.WriteLine($":: {VERSION_BUILD_VAR} env var detected but the version value \"{value}\" is not an integer.");
         }
 
-        private static string GetIosVersion()
+        private static void HandleExportAndroidProject()
         {
-            if (TryGetEnv(VERSION_iOS, out string value))
+            EditorUserBuildSettings.exportAsGoogleAndroidProject = false;
+            if (!TryGetEnv(EXPORT_ANDROID_PROJECT, out string stringValue)) return;
+            if (bool.TryParse(stringValue, out bool exportAndroidProject))
             {
-                if (int.TryParse(value, out int version))
-                {
-                    Console.WriteLine($":: {VERSION_iOS} env var detected, set the version to {value}.");
-                    return version.ToString();
-                }
-                else
-                    Console.WriteLine($":: {VERSION_iOS} env var detected but the version value \"{value}\" is not an integer.");
+                EditorUserBuildSettings.exportAsGoogleAndroidProject = exportAndroidProject;
             }
-
-            throw new ArgumentNullException(nameof(value), $":: Error finding {VERSION_iOS} env var");
         }
 
         private static void HandleAndroidKeystore()
@@ -311,44 +366,58 @@ namespace Amanotes.Core
             PlayerSettings.Android.keystorePass = keystorePass;
             PlayerSettings.Android.keyaliasPass = keystoreAliasPass;
         }
+        
+        private static void HandleDebugSymbols()
+        {
+            #if UNITY_2021_1_OR_NEWER
+            EditorUserBuildSettings.androidCreateSymbols = AndroidCreateSymbols.Debugging;
+            #elif UNITY_2019_2_OR_NEWER
+            EditorUserBuildSettings.androidCreateSymbolsZip = true;
+            #endif
+        }
     }
     
-    public class GDKPreProcessBuild: IPreprocessBuildWithReport
+    [Serializable]
+    public class BuildMetadata
     {
-    #if UNITY_2022_1_OR_NEWER
-        private static readonly string GRADLE_VERSION = "7.6.1";
-    #else
-        private static readonly string GRADLE_VERSION = "6.7.1";
-    #endif
-        private static readonly string GRADLE_ROOT = "/usr/local/gradle";
+        public string appVersion;
+        public string buildNumber;
+        public string buildTarget; 
         
+        public static void Save(string buildPath, BuildTarget buildTarget)
+        {
+            string outputFile = Path.Combine(buildPath, "build_info.json");
+
+            var metadata = new BuildMetadata
+            {
+                appVersion = PlayerSettings.bundleVersion,
+                buildNumber = buildTarget == BuildTarget.Android ? PlayerSettings.Android.bundleVersionCode.ToString() : PlayerSettings.iOS.buildNumber,
+                buildTarget = buildTarget.ToString()
+            };
+
+            string json = JsonUtility.ToJson(metadata, prettyPrint: true);
+            File.WriteAllText(outputFile, json);
+
+            Console.WriteLine($":: Build information saved to {outputFile}");
+        }
+    }
+    
+    public class GDKPreProcessBuild: IPreprocessBuildWithReport
+    {
         public int callbackOrder
         {
             get { return 0; }
         }
         public void OnPreprocessBuild(BuildReport report)
         {
-            if (report.summary.platform == BuildTarget.Android)
-            {
-                // Change Gradle path when running in headless mode (CI Machine)
-                if (Application.isBatchMode)
-                {   
-                    EditorPrefs.SetBool("GradleUseEmbedded", false);
-                    
-                    if (GDKCIBuildCommand.TryGetEnv("GRADLE_PATH", out string envGradlePath))
-                    {   
-                        EditorPrefs.SetString("GradlePath", envGradlePath);
-                        Debug.Log("Update gradle path to: " + envGradlePath);
-                    }
-                    else
-                    {
-                        string gradlePath = GRADLE_ROOT + "/gradle-" + GRADLE_VERSION;
-                        EditorPrefs.SetString("GradlePath", gradlePath);
-                        Debug.Log("Update gradle path to: " + gradlePath);
-                    }
-                }
-            }
-            
+            if (report.summary.platform != BuildTarget.Android) return;
+            // Change Gradle path when running in headless mode (CI Machine)
+            if (!Application.isBatchMode) return;
+            if (!GDKCIBuildCommand.TryGetEnv("GRADLE_PATH", out string envGradlePath)) return;
+            EditorPrefs.SetBool("GradleUseEmbedded", false);
+            EditorPrefs.SetString("GradlePath", envGradlePath);
+            Debug.Log("Update gradle path to: " + envGradlePath);
+
         }
     }
 }

package/Runtime/AmaGDK.cs

@@ -17,7 +17,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.66-7";
+        public const string VERSION = "0.2.66-8";
         
         internal static Status _status = Status.None;
         private static ConfigAsset _config = null;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "com.amanotes.gdk",
-    "version": "0.2.66-7",
+    "version": "0.2.66-8",
     "displayName": "AmaGDK",
     "description": "Amanotes Game Development Kit",
     "unity": "2019.4",