Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v8.5.0 #873

Merged
merged 4 commits into from
Jan 28, 2025
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 6 additions & 30 deletions .buildkite/unity.2020.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "*"
Expand All @@ -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: "*"
Expand Down
39 changes: 6 additions & 33 deletions .buildkite/unity.2021.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "*"
Expand All @@ -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: "*"
Expand Down
36 changes: 6 additions & 30 deletions .buildkite/unity.2022.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "*"
Expand All @@ -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: "*"
Expand Down
36 changes: 6 additions & 30 deletions .buildkite/unity.6000.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: "*"
Expand All @@ -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: "*"
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,5 @@ upm/UPMImportProject/Library
upm-package
upm/UPMImportProject/.vscode
UPMImportProject.sln
!features/build/

5 changes: 2 additions & 3 deletions Bugsnag/Assets/Bugsnag/Editor/BugsnagAddScriptingSymbol.cs
Original file line number Diff line number Diff line change
@@ -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";

Expand Down Expand Up @@ -38,4 +37,4 @@ static void SetScriptingSymbol(BuildTargetGroup buildTargetGroup)
BugsnagPlayerSettingsCompat.SetScriptingDefineSymbols(buildTargetGroup, existingSymbols);
}
}
}
}
2 changes: 1 addition & 1 deletion Bugsnag/Assets/Bugsnag/Editor/BugsnagEditor.EDM.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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())
Expand Down
21 changes: 20 additions & 1 deletion Bugsnag/Assets/Bugsnag/Editor/BugsnagEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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();
Expand All @@ -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"));
Expand Down Expand Up @@ -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)
{

Expand Down
9 changes: 9 additions & 0 deletions Bugsnag/Assets/Bugsnag/Editor/BugsnagPlayerSettingsCompat.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down
8 changes: 8 additions & 0 deletions Bugsnag/Assets/Bugsnag/Editor/SymbolUpload.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading