diff --git a/CHANGELOG.md b/CHANGELOG.md index 98be1afa0..744311753 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,8 @@ - Removed `Override Sentry URL` from editor window ([#1188](https://github.com/getsentry/sentry-unity/pull/1188)) - The option is still available from within the `SentryBuildTimeOptionsConfiguration` +- Renamed `OptionsConfiguration` to `RuntimeOptionsConfiguration` on the ScriptableSentryOptions ([#1196](https://github.com/getsentry/sentry-unity/pull/1196)) + - If you make use of programmatic runtime options configuration, you will need to reassign the scriptable object in the configuration tab ### Feature diff --git a/src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs b/src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs index 84abcca8d..3738b6b78 100644 --- a/src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs +++ b/src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs @@ -32,8 +32,8 @@ public static void Display(ScriptableSentryUnityOptions options) EditorGUILayout.Space(); - options.OptionsConfiguration = OptionsConfigurationItem.Display( - options.OptionsConfiguration, + options.RuntimeOptionsConfiguration = OptionsConfigurationItem.Display( + options.RuntimeOptionsConfiguration, "Runtime Options Script", "RuntimeOptionsConfiguration" ); @@ -153,7 +153,7 @@ internal static void SetScript(string scriptNameWithoutExtension) else { // Don't overwrite already set OptionsConfiguration - options.OptionsConfiguration ??= optionsConfigurationObject as SentryRuntimeOptionsConfiguration; + options.RuntimeOptionsConfiguration ??= optionsConfigurationObject as SentryRuntimeOptionsConfiguration; } } } diff --git a/src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs b/src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs index d183dcc36..c8620e07a 100644 --- a/src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs +++ b/src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs @@ -79,7 +79,7 @@ public override void OnInspectorGUI() EditorGUILayout.Space(); EditorGUILayout.LabelField("Options Configuration", EditorStyles.boldLabel); - EditorGUILayout.ObjectField("Runtime Configuration", options.OptionsConfiguration, + EditorGUILayout.ObjectField("Runtime Configuration", options.RuntimeOptionsConfiguration, typeof(SentryRuntimeOptionsConfiguration), false); EditorGUILayout.ObjectField("Buildtime Configuration", options.BuildtimeOptionsConfiguration, typeof(SentryBuildtimeOptionsConfiguration), false); diff --git a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs index 309219382..7940b785b 100644 --- a/src/Sentry.Unity/ScriptableSentryUnityOptions.cs +++ b/src/Sentry.Unity/ScriptableSentryUnityOptions.cs @@ -81,7 +81,7 @@ public static string GetConfigPath(string? notDefaultConfigName = null) [field: SerializeField] public bool Il2CppLineNumberSupportEnabled { get; set; } = true; - [field: SerializeField] public SentryRuntimeOptionsConfiguration? OptionsConfiguration { get; set; } + [field: SerializeField] public SentryRuntimeOptionsConfiguration? RuntimeOptionsConfiguration { get; set; } [field: SerializeField] public SentryBuildtimeOptionsConfiguration? BuildtimeOptionsConfiguration { get; set; } [field: SerializeField] public bool Debug { get; set; } = true; @@ -193,9 +193,9 @@ internal SentryUnityOptions ToSentryUnityOptions(bool isBuilding, ISentryUnityIn if (!isBuilding) { - if (OptionsConfiguration != null) + if (RuntimeOptionsConfiguration != null) { - OptionsConfiguration.Configure(options); + RuntimeOptionsConfiguration.Configure(options); } // Doing this after the configure callback to allow users to programmatically opt out diff --git a/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs b/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs index c256cab5d..ca8718604 100644 --- a/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs +++ b/test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs @@ -114,7 +114,7 @@ public void ToSentryUnityOptions_HasOptionsConfiguration_GetsCalled(bool isBuild { var optionsConfiguration = ScriptableObject.CreateInstance(); var scriptableOptions = ScriptableObject.CreateInstance(); - scriptableOptions.OptionsConfiguration = optionsConfiguration; + scriptableOptions.RuntimeOptionsConfiguration = optionsConfiguration; scriptableOptions.ToSentryUnityOptions(isBuilding);