Merge pull request #873 from bugsnag/next

Release v8.5.0
bugsnag · Jan 28, 2025 · 166a30b · 166a30b
2 parents b9730cd + a5ac2dd
commit 166a30b
Show file tree

Hide file tree

Showing 55 changed files with 1,599 additions and 184 deletions.
diff --git a/.buildkite/unity.2020.yml b/.buildkite/unity.2020.yml
@@ -19,9 +19,9 @@ steps:
             upload:
               - features/fixtures/maze_runner/mazerunner_2020.apk
               - features/fixtures/build_android_apk.log
-        commands:
-          - bundle install
-          - rake test:android:build
+        command:
+              - "bundle install"
+              - "bundle exec maze-runner --os macos features/build/build_android.feature"
         retry:
           automatic:
             - exit_status: "*"
@@ -30,46 +30,22 @@ steps:
       #
       # Build iOS test fixtures
       #
-      - label: ":ios: Generate Xcode project - Unity 2020"
-        timeout_in_minutes: 20
-        key: "generate-fixture-project-2020"
-        env:
-          UNITY_VERSION: *2020
-        plugins:
-          artifacts#v1.9.0:
-            download:
-              - Bugsnag.unitypackage
-            upload:
-              - features/fixtures/unity.log
-              - project_2020.tgz
-        commands:
-          - bundle install
-          - rake test:ios:generate_xcode
-          - tar -zvcf project_2020.tgz features/fixtures/maze_runner/mazerunner_xcode
-        retry:
-          automatic:
-            - exit_status: "*"
-              limit: 1
-
       - label: ":ios: Build iOS test fixture for Unity 2020"
         timeout_in_minutes: 10
         key: "build-ios-fixture-2020"
-        depends_on: "generate-fixture-project-2020"
         env:
           XCODE_VERSION: "15.3.0"
           UNITY_VERSION: *2020
         plugins:
           artifacts#v1.9.0:
             download:
               - Bugsnag.unitypackage
-              - project_2020.tgz
             upload:
               - features/fixtures/maze_runner/mazerunner_2020.ipa
               - features/fixtures/unity.log
-        commands:
-          - bundle install
-          - tar -zxf project_2020.tgz features/fixtures/maze_runner
-          - rake test:ios:build_xcode
+        command:
+              - "bundle install"
+              - "bundle exec maze-runner --os macos features/build/build_ios.feature"
         retry:
           automatic:
             - exit_status: "*"

diff --git a/.buildkite/unity.2021.yml b/.buildkite/unity.2021.yml
@@ -19,33 +19,9 @@ steps:
             upload:
               - features/fixtures/maze_runner/mazerunner_2021.apk
               - features/fixtures/build_android_apk.log
-        commands:
-          - bundle install
-          - rake test:android:build
-        retry:
-          automatic:
-            - exit_status: "*"
-              limit: 1
-
-      #
-      # Build iOS test fixtures
-      #
-      - label: ":ios: Generate Xcode project - Unity 2021"
-        timeout_in_minutes: 20
-        key: "generate-fixture-project-2021"
-        env:
-          UNITY_VERSION: *2021
-        plugins:
-          artifacts#v1.5.0:
-            download:
-              - Bugsnag.unitypackage
-            upload:
-              - features/fixtures/unity.log
-              - project_2021.tgz
-        commands:
-          - bundle install
-          - rake test:ios:generate_xcode
-          - tar -zvcf project_2021.tgz features/fixtures/maze_runner/mazerunner_xcode
+        command:
+              - "bundle install"
+              - "bundle exec maze-runner --os macos features/build/build_android.feature"
         retry:
           automatic:
             - exit_status: "*"
@@ -54,22 +30,19 @@ steps:
       - label: ":ios: Build iOS test fixture for Unity 2021"
         timeout_in_minutes: 10
         key: "build-ios-fixture-2021"
-        depends_on: "generate-fixture-project-2021"
         env:
           UNITY_VERSION: *2021
           XCODE_VERSION: "15.3.0"
         plugins:
           artifacts#v1.5.0:
             download:
               - Bugsnag.unitypackage
-              - project_2021.tgz
             upload:
               - features/fixtures/maze_runner/mazerunner_2021.ipa
               - features/fixtures/unity.log
-        commands:
-          - bundle install
-          - tar -zxf project_2021.tgz features/fixtures/maze_runner
-          - rake test:ios:build_xcode
+        command:
+              - "bundle install"
+              - "bundle exec maze-runner --os macos features/build/build_ios.feature"
         retry:
           automatic:
             - exit_status: "*"

diff --git a/.buildkite/unity.2022.yml b/.buildkite/unity.2022.yml
@@ -19,30 +19,9 @@ steps:
             upload:
               - features/fixtures/maze_runner/mazerunner_2022.apk
               - features/fixtures/build_android_apk.log
-        commands:
-          - bundle install
-          - rake test:android:build
-        retry:
-          automatic:
-            - exit_status: "*"
-              limit: 1
-
-      - label: ":ios: Generate Xcode project - Unity 2022"
-        timeout_in_minutes: 10
-        key: "generate-fixture-project-2022"
-        env:
-          UNITY_VERSION: *2022
-        plugins:
-          artifacts#v1.9.0:
-            download:
-              - Bugsnag.unitypackage
-            upload:
-              - features/fixtures/unity.log
-              - project_2022.tgz
-        commands:
-          - bundle install
-          - rake test:ios:generate_xcode
-          - tar -zvcf project_2022.tgz features/fixtures/maze_runner/mazerunner_xcode
+        command:
+              - "bundle install"
+              - "bundle exec maze-runner --os macos features/build/build_android.feature"
         retry:
           automatic:
             - exit_status: "*"
@@ -51,22 +30,19 @@ steps:
       - label: ":ios: Build iOS test fixture for Unity 2022"
         timeout_in_minutes: 10
         key: "build-ios-fixture-2022"
-        depends_on: "generate-fixture-project-2022"
         env:
           UNITY_VERSION: *2022
           XCODE_VERSION: "15.3.0"
         plugins:
           artifacts#v1.9.0:
             download:
               - Bugsnag.unitypackage
-              - project_2022.tgz
             upload:
               - features/fixtures/maze_runner/mazerunner_2022.ipa
               - features/fixtures/unity.log
-        commands:
-          - bundle install
-          - tar -zxf project_2022.tgz features/fixtures/maze_runner
-          - rake test:ios:build_xcode
+        command:
+              - "bundle install"
+              - "bundle exec maze-runner --os macos features/build/build_ios.feature"
         retry:
           automatic:
             - exit_status: "*"

diff --git a/.buildkite/unity.6000.yml b/.buildkite/unity.6000.yml
@@ -19,30 +19,9 @@ steps:
             upload:
               - features/fixtures/maze_runner/mazerunner_6000.apk
               - features/fixtures/build_android_apk.log
-        commands:
-          - bundle install
-          - rake test:android:build
-        retry:
-          automatic:
-            - exit_status: "*"
-              limit: 1
-
-      - label: ":ios: Generate Xcode project - Unity 6000"
-        timeout_in_minutes: 10
-        key: "generate-fixture-project-6000"
-        env:
-          UNITY_VERSION: *6000
-        plugins:
-          artifacts#v1.9.0:
-            download:
-              - Bugsnag.unitypackage
-            upload:
-              - features/fixtures/unity.log
-              - project_6000.tgz
-        commands:
-          - bundle install
-          - rake test:ios:generate_xcode
-          - tar -zvcf project_6000.tgz features/fixtures/maze_runner/mazerunner_xcode
+        command:
+              - "bundle install"
+              - "bundle exec maze-runner --os macos features/build/build_android.feature"
         retry:
           automatic:
             - exit_status: "*"
@@ -51,22 +30,19 @@ steps:
       - label: ":ios: Build iOS test fixture for Unity 6000"
         timeout_in_minutes: 10
         key: "build-ios-fixture-6000"
-        depends_on: "generate-fixture-project-6000"
         env:
           UNITY_VERSION: *6000
           XCODE_VERSION: "16.0.0"
         plugins:
           artifacts#v1.9.0:
             download:
               - Bugsnag.unitypackage
-              - project_6000.tgz
             upload:
               - features/fixtures/maze_runner/mazerunner_6000.ipa
               - features/fixtures/unity.log
-        commands:
-          - bundle install
-          - tar -zxf project_6000.tgz features/fixtures/maze_runner
-          - rake test:ios:build_xcode
+        command:
+              - "bundle install"
+              - "bundle exec maze-runner --os macos features/build/build_ios.feature"
         retry:
           automatic:
             - exit_status: "*"

diff --git a/.gitignore b/.gitignore
@@ -65,3 +65,5 @@ upm/UPMImportProject/Library
 upm-package
 upm/UPMImportProject/.vscode
 UPMImportProject.sln
+!features/build/
+
diff --git a/Bugsnag/Assets/Bugsnag/Editor/BugsnagAddScriptingSymbol.cs b/Bugsnag/Assets/Bugsnag/Editor/BugsnagAddScriptingSymbol.cs
@@ -1,9 +1,8 @@
 using UnityEditor;
-using UnityEngine;
 namespace BugsnagUnity.Editor
 {
     [InitializeOnLoad]
-    public class BugsnagAddScriptingSymbol : MonoBehaviour
+    public class BugsnagAddScriptingSymbol
     {
         private const string DEFINE_SYMBOL = "BUGSNAG_UNITY_WEB_REQUEST";
 
@@ -38,4 +37,4 @@ static void SetScriptingSymbol(BuildTargetGroup buildTargetGroup)
             BugsnagPlayerSettingsCompat.SetScriptingDefineSymbols(buildTargetGroup, existingSymbols);
         }
     }
-}
+}
diff --git a/Bugsnag/Assets/Bugsnag/Editor/BugsnagEditor.EDM.cs b/Bugsnag/Assets/Bugsnag/Editor/BugsnagEditor.EDM.cs
@@ -20,7 +20,7 @@ public partial class BugsnagEditor : EditorWindow
 
         private static string KotlinLibsDirPath = "/Bugsnag/Plugins/Android/Kotlin";
 
-        [MenuItem(EDM_MENU_ITEM, false, 1)]
+        [MenuItem(EDM_MENU_ITEM, false, 51)]
         private static void ToggleEDM()
         {
             if (IsEDMEnabled())

diff --git a/Bugsnag/Assets/Bugsnag/Editor/BugsnagEditor.cs b/Bugsnag/Assets/Bugsnag/Editor/BugsnagEditor.cs
@@ -15,7 +15,7 @@ public partial class BugsnagEditor : EditorWindow
 
         private bool _showBasicConfig = true;
 
-        private bool _showAdvancedSettings, _showAppInformation, _showEndpoints, _showEnabledErrorTypes, _showSwitch;
+        private bool _showAdvancedSettings, _showAppInformation, _showEndpoints, _showEnabledErrorTypes, _showSwitch, _showSymbolUpload;
 
         public Texture DarkIcon, LightIcon;
 
@@ -116,6 +116,13 @@ private void DrawSettingsEditorWindow()
                 DrawSwitchOptions(so);
             }
 
+            GUILayout.Space(5);
+            _showSymbolUpload = EditorGUILayout.Foldout(_showSymbolUpload, new GUIContent("Automatic Symbol Upload ⓘ", "Android and Xcode builds only"), true);
+            if (_showSymbolUpload)
+            {
+                DrawSymbolUploadOptions(so);
+            }
+
             GUILayout.Space(10);
 
             GUILayout.EndVertical();
@@ -141,12 +148,14 @@ private void DrawEndpoints(SerializedObject so)
             EditorGUI.indentLevel++;
             EditorGUILayout.PropertyField(so.FindProperty("NotifyEndpoint"));
             EditorGUILayout.PropertyField(so.FindProperty("SessionEndpoint"));
+            EditorGUILayout.PropertyField(so.FindProperty("UploadEndpoint"));
             EditorGUI.indentLevel--;
         }
 
         private void DrawAppInfo(SerializedObject so, BugsnagSettingsObject settings)
         {
             EditorGUI.indentLevel++;
+            EditorGUIUtility.labelWidth = 270;
             EditorGUILayout.PropertyField(so.FindProperty("AppType"));
             EditorGUILayout.PropertyField(so.FindProperty("AppVersion"));
             EditorGUILayout.PropertyField(so.FindProperty("ReleaseStage"));
@@ -196,13 +205,23 @@ private void DrawAdvancedSettings(SerializedObject so, BugsnagSettingsObject set
         private void DrawSwitchOptions(SerializedObject so)
         {
             EditorGUI.indentLevel++;
+            EditorGUIUtility.labelWidth = 270;
             EditorGUILayout.PropertyField(so.FindProperty("SwitchCacheIndex"));
             EditorGUILayout.PropertyField(so.FindProperty("SwitchCacheMaxSize"));
             EditorGUILayout.PropertyField(so.FindProperty("SwitchCacheMountName"));
             EditorGUILayout.PropertyField(so.FindProperty("SwitchCacheType"));
             EditorGUI.indentLevel--;
         }
 
+        private void DrawSymbolUploadOptions(SerializedObject so)
+        {
+            EditorGUI.indentLevel++;
+            EditorGUIUtility.labelWidth = 270;
+            EditorGUILayout.PropertyField(so.FindProperty("AutoUploadSymbols"));
+            EditorGUILayout.PropertyField(so.FindProperty("BugsnagCLIExecutablePath"));
+            EditorGUI.indentLevel--;
+        }
+
         private void DrawEnabledErrorTypesDropdown(BugsnagSettingsObject settings)
         {
 

diff --git a/Bugsnag/Assets/Bugsnag/Editor/BugsnagPlayerSettingsCompat.cs b/Bugsnag/Assets/Bugsnag/Editor/BugsnagPlayerSettingsCompat.cs
@@ -16,6 +16,15 @@ public static ScriptingImplementation GetScriptingBackend(BuildTargetGroup build
 #endif
         }
 
+        public static string GetApplicationIdentifier(BuildTargetGroup buildTargetGroup)
+        {
+#if UNITY_6000_0_OR_NEWER
+                return PlayerSettings.GetApplicationIdentifier(NamedBuildTarget.FromBuildTargetGroup(buildTargetGroup));
+#else
+                return PlayerSettings.GetApplicationIdentifier(buildTargetGroup);
+#endif
+        }
+
         // Get Scripting Define Symbols
         public static string GetScriptingDefineSymbols(BuildTargetGroup buildTargetGroup)
         {

diff --git a/Bugsnag/Assets/Bugsnag/Editor/SymbolUpload.meta b/Bugsnag/Assets/Bugsnag/Editor/SymbolUpload.meta