universal uploader working

bugsnag · Dec 17, 2024 · ce2c450 · ce2c450
1 parent 20c7214
commit ce2c450
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 29 deletions.
diff --git a/Bugsnag/Assets/Bugsnag/Editor/SymbolUpload/BugsnagCLI.cs b/Bugsnag/Assets/Bugsnag/Editor/SymbolUpload/BugsnagCLI.cs
@@ -189,7 +189,7 @@ private int StartProcess(string fileName, string arguments, out string standardO
 
         public string GetIosDsymUploadCommand(string apiKey, string uploadEndpoint)
         {
-            var command = $"{_cliExecutablePath} upload dsym --api-key={apiKey} --configuration $CONFIGURATION $DSYM_PATH";
+            var command = $"{_cliExecutablePath} upload xcode-build --api-key={apiKey} $DWARF_DSYM_FOLDER_PATH";
             if (!string.IsNullOrEmpty(uploadEndpoint))
             {
                 command += $" --upload-api-root-url={uploadEndpoint}";

diff --git a/Bugsnag/Assets/Bugsnag/Editor/SymbolUpload/BugsnagSymbolUploader.cs b/Bugsnag/Assets/Bugsnag/Editor/SymbolUpload/BugsnagSymbolUploader.cs
@@ -15,20 +15,16 @@ internal class BugsnagSymbolUploader : IPostprocessBuildWithReport
     {
         public int callbackOrder => 1;
 
-        private const string IOS_DSYM_UPLOAD_SCRIPT_TEMPLATE = @"
-        #!/bin/bash
-        # Iterate through all input files
-        for ((i=0; i<SCRIPT_INPUT_FILE_COUNT; i++))
-        do
-            # Dynamically get the input file variable name
-            INPUT_FILE_VAR=""SCRIPT_INPUT_FILE_$i""
-            INPUT_FILE=${!INPUT_FILE_VAR}
-            # Extract path up to and including BugsnagUnity.app.dSYM
-            DSYM_PATH=$(echo ""$INPUT_FILE"" | sed 's#/Contents.*##')
-            echo ""Uploading dSYM: $DSYM_PATH""
-            # Upload the dSYM file
-            <CLI_COMMAND>
-        done";
+private const string IOS_DSYM_UPLOAD_SCRIPT_TEMPLATE = @"#!/bin/bash
+if [ ""$ACTION"" == ""install"" ]; then
+    echo ""Archiving - Running Bugsnag upload script...""
+    if ! <CLI_COMMAND>; then
+        echo ""warning: Bugsnag upload failed, continuing build...""
+    fi
+else
+    echo ""Not archiving - Skipping Bugsnag upload script.""
+fi
+";
 
         private const string IOS_DSYM_UPLOAD_BUILD_PHASE_NAME = "BugsnagDSYMUpload";
         private const string IOS_DSYM_UPLOAD_SHELL_NAME = "/bin/sh";
@@ -138,20 +134,7 @@ private void AddIosPostBuildScript(string pathToBuiltProject, string apiKey, str
                 }
             }
 
-            // add the upload script to the unity framework target
-            string unityFrameworkGUID = pbxProject.GetUnityFrameworkTargetGuid();
-            foreach (var guid in pbxProject.GetAllBuildPhasesForTarget(unityFrameworkGUID))
-            {
-                if (IOS_DSYM_UPLOAD_BUILD_PHASE_NAME == pbxProject.GetBuildPhaseName(guid))
-                {
-                    // remove existing build phase
-                    var editedProject = RemoveShellScriptPhase(pbxProject.WriteToString(), guid);
-                    pbxProject.ReadFromString(editedProject);
-                }
-            }
-
-            pbxProject.AddShellScriptBuildPhase(mainAppTargetGUID, IOS_DSYM_UPLOAD_BUILD_PHASE_NAME, IOS_DSYM_UPLOAD_SHELL_NAME, dsymUploadScript, IOS_DSYM_UPLOAD_INPUT_FILES_LIST);
-            pbxProject.AddShellScriptBuildPhase(unityFrameworkGUID, IOS_DSYM_UPLOAD_BUILD_PHASE_NAME, IOS_DSYM_UPLOAD_SHELL_NAME, dsymUploadScript, IOS_DSYM_UPLOAD_INPUT_FILES_LIST);
+            pbxProject.AddShellScriptBuildPhase(mainAppTargetGUID, IOS_DSYM_UPLOAD_BUILD_PHASE_NAME, IOS_DSYM_UPLOAD_SHELL_NAME, dsymUploadScript);
             pbxProject.WriteToFile(pbxProjectPath);
 #endif
         }