com.amanotes.gdk 0.2.81-a1 → 0.2.81-a3

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [0.2.81-a1] - 2024-11-21
+## [0.2.81-a3] - 2024-11-21
 - [Dev] Add GDKPostBuild for iOS
 - [Dev] Improve GDK editor experience before config asset imported
 - [Dev] Analytics save file in async

package/Editor/Extra/GDKCIBuildCommand.cs

@@ -24,32 +24,58 @@ namespace Amanotes.Core
         private const string VERSION_NUMBER_VAR = "VERSION_NUMBER_VAR";
         private const string VERSION_iOS = "VERSION_BUILD_VAR";
         
-        public static void InstallPod(EventHandler processExit)
+        public static void InstallPod(EventHandler processExit, string buildPath = null)
         {
             try
             {
-                if (TryGetEnv("CI_SCRIPT_DIR", out string scriptDir))
+                var arguments = $"-c \"/usr/local/bin/pod install --project-directory={buildPath}\"";
+                if (Application.isBatchMode && TryGetEnv("CI_SCRIPT_DIR", out string scriptDir))
                 {
-                    var startInfo = new ProcessStartInfo()
-                    {
-                        FileName = "/bin/bash",
-                        Arguments = $"{scriptDir}/utils.sh pod-install",
-                        CreateNoWindow = true
-                    };
-                    var proc = new Process
-                    {
-                        StartInfo = startInfo,
-                        EnableRaisingEvents = true
-                    };
-                    proc.Exited += processExit;
-                    proc.Start();
-                    proc.WaitForExit();
+                    arguments = $"{scriptDir}/utils.sh pod-install";
                 }
-                else
+                
+                // Configure process start info
+                var startInfo = new ProcessStartInfo
                 {
-                    Debug.Log("Failed to run pod install: $CI_SCRIPT_DIR not found");
-                }
-            } catch (Exception e)
+                    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.ErrorDataReceived += (sender, args) =>
+                // {
+                //     if (args.Data == null) return; // End of the stream
+                //     Debug.LogError(args.Data);
+                // };
+
+                proc.Exited += processExit;
+
+                // Start the process
+                proc.Start();
+                proc.BeginOutputReadLine();
+                proc.BeginErrorReadLine();
+                proc.WaitForExit();
+
+                // Log exit code
+                // Debug.LogWarning("Process exited with code: " + proc.ExitCode);
+            }
+            catch (Exception e)
             {
                 Debug.LogError(e);
             }

package/Editor/Extra/GDKPostBuildAsset.cs

@@ -6,6 +6,7 @@ using System.Collections.Generic;
 using UnityEditor.Callbacks;
 
 #if UNITY_IOS
+using Amanotes.Core;
 using UnityEditor.iOS.Xcode;
 using UnityEditor.iOS.Xcode.Extensions;
 #endif
@@ -101,17 +102,21 @@ namespace Amanotes.Editor
         [Header("Capabilities to Enable")]
         public List<Capability> capabilities = new List<Capability>
         {
-            new Capability { type = "com.apple.Push", entitlementFile = "pamarollingtiles2.entitlements", enable = true },
+            new Capability { type = "com.apple.Push", entitlementFile = "amanotes.entitlements", enable = true },
             new Capability { type = "com.apple.InAppPurchase", entitlementFile = "", enable = true },
             new Capability { type = "com.apple.BackgroundModes", entitlementFile = "", enable = true }
         };
 
+        public string lastBuildPath;
+
 #if UNITY_IOS
         private const string PLIST_FILE = "Info.plist";
         private const string EXIST_ON_SUSPEND_KEY = "UIApplicationExitsOnSuspend";
 
         public void ExecutePostBuild(string pathToBuildProject)
         {
+            lastBuildPath = pathToBuildProject;
+            
             if (string.IsNullOrEmpty(pathToBuildProject))
             {
                 Debug.LogError("Path to build project is null or empty.");
@@ -144,15 +149,16 @@ namespace Amanotes.Editor
                 return;
             }
 
-            Debug.Log($"Main Target GUID: {mainTargetGuid}");
-
             SetBuildProperties(proj, mainTargetGuid);
             AddCapabilities(proj, pathToBuildProject, mainTargetGuid);
             AddFrameworks(proj, mainTargetGuid);
-            AddPodFrameworks(proj, pathToBuildProject, mainTargetGuid);
-            ModifyInfoPlist(pathToBuildProject);
-
-            proj.WriteToFile(projectPath);
+            
+            GDKCIBuildCommand.InstallPod((sender, e) =>
+            {
+                AddPodFrameworks(proj, pathToBuildProject, mainTargetGuid);
+                ModifyInfoPlist(pathToBuildProject);
+                proj.WriteToFile(projectPath);
+            }, pathToBuildProject);
         }
         
         private void RemoveDeprecatedInfoPListKeys(string pathToBuildProject)
@@ -327,7 +333,7 @@ namespace Amanotes.Editor
             return null;
         }
 
-        [PostProcessBuild]
+        [PostProcessBuild(999)]
         public static void OnPostprocessBuild(BuildTarget target, string pathToBuildProject)
         {
             if (target != BuildTarget.iOS) return;
@@ -342,8 +348,15 @@ namespace Amanotes.Editor
         [MenuItem("Window/AmaGDK/Postprocess Build iOS")]
         public static void RunPostBuildIOS()
         {
-            string exportPath = Path.GetFullPath("./XCode");
-            OnPostprocessBuild(BuildTarget.iOS, exportPath);
+            var buildAsset = FindGDKPostBuildAsset(); 
+            if (buildAsset == null) return;
+            
+            if (string.IsNullOrEmpty(buildAsset.lastBuildPath))
+            {
+                buildAsset.lastBuildPath = Path.GetFullPath("../../_Build/XCode_PHB3_v2.13.3_b200611");
+            }
+            
+            OnPostprocessBuild(BuildTarget.iOS, buildAsset.lastBuildPath);
         }
 
         public static GDKPostBuildAsset FindGDKPostBuildAsset()

package/Runtime/AmaGDK.cs

@@ -27,7 +27,7 @@ namespace Amanotes.Core
 {
     public partial class AmaGDK : MonoBehaviour
     {
-        public const string VERSION = "0.2.81-a1";
+        public const string VERSION = "0.2.81-a3";
         
         internal static Status _status = Status.None;
         internal static ConfigAsset _config = null;

package/package.json

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