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.

Sign up for GitHub

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

Jump to bottom

chore: Renamed OptionsConfig to RuntimeOptionsConfig #1196

Merged
merged 3 commits into from
Feb 27, 2023
Merged

chore: Renamed OptionsConfig to RuntimeOptionsConfig #1196

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0856a12
renamed optionsconfig to runtimeoptionsconfig
bitsandfoxes Feb 22, 2023
0338cf5
Updated CHANGELOG.md
bitsandfoxes Feb 22, 2023
acea142
Update CHANGELOG.md
bitsandfoxes Feb 27, 2023
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 programmatic runtime options configuration, you will need to reassign the scriptable object in the configuration tab
bitsandfoxes marked this conversation as resolved.
Show resolved Hide resolved

### Feature

Expand Down
6 changes: 3 additions & 3 deletions src/Sentry.Unity.Editor/ConfigurationWindow/OptionsConfigurationTab.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
);
Expand Down Expand Up @@ -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;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Sentry.Unity.Editor/ScriptableSentryUnityOptionsEditor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 3 additions & 3 deletions src/Sentry.Unity/ScriptableSentryUnityOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion test/Sentry.Unity.Tests/ScriptableSentryUnityOptionsTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ public void ToSentryUnityOptions_HasOptionsConfiguration_GetsCalled(bool isBuild
{
var optionsConfiguration = ScriptableObject.CreateInstance<TestOptionsConfiguration>();
var scriptableOptions = ScriptableObject.CreateInstance<ScriptableSentryUnityOptions>();
scriptableOptions.OptionsConfiguration = optionsConfiguration;
scriptableOptions.RuntimeOptionsConfiguration = optionsConfiguration;

scriptableOptions.ToSentryUnityOptions(isBuilding);

Expand Down