Skip to content

FIX: ISXB-996 fixed Package compilation when Unity Analytics module is not enabled on 2022.3. #1987

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

Merged
merged 3 commits into from
Aug 19, 2024
Merged

FIX: ISXB-996 fixed Package compilation when Unity Analytics module is not enabled on 2022.3. #1987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fac18e
Fixed Package compilation when Unity Analytics module is not enabled …
bmalrat Aug 19, 2024
c68d7a3
format fix
bmalrat Aug 19, 2024
15bdc73
Merge branch 'develop' into isxb-996-fix-for-build-break-when-analyti…
bmalrat Aug 19, 2024
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
1 change: 1 addition & 0 deletions Packages/com.unity.inputsystem/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ however, it has to be formatted properly to pass verification tests.
- Fixed memory allocation on every frame when using UIDocument without EventSystem. [ISXB-953](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-953)
- Fixed Action Maps name edition which could be inconsistent in Input Action Editor UI.
- Fixed InputDeviceTester sample only visualizing a given touch contact once. [ISXB-1017](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-1017)
- Fixed Package compilation when Unity Analytics module is not enabled on 2022.3. [ISXB-996](https://issuetracker.unity3d.com/product/unity/issues/guid/ISXB-996)

### Added
- Added Hinge Angle sensor support for foldable devices.
Expand Down
3 changes: 3 additions & 0 deletions Packages/com.unity.inputsystem/InputSystem/NativeInputRuntime.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,9 +398,12 @@ public void SendAnalytic(InputAnalytics.IInputAnalytic analytic)
#if (UNITY_2023_2_OR_NEWER)
EditorAnalytics.SendAnalytic(analytic);
#else
// The preprocessor filtering is a workaround for the fact that the AnalyticsResult enum is not available before 2023.1.0a14 when not using the built-in Unity Analytics module.
#if UNITY_INPUT_SYSTEM_ENABLE_ANALYTICS || UNITY_2023_1_OR_NEWER
var info = analytic.info;
EditorAnalytics.RegisterEventWithLimit(info.Name, info.MaxEventsPerHour, info.MaxNumberOfElements, InputAnalytics.kVendorKey);
EditorAnalytics.SendEventWithLimit(info.Name, analytic);
#endif // UNITY_INPUT_SYSTEM_ENABLE_ANALYTICS || UNITY_2023_1_OR_NEWER
#endif // UNITY_2023_2_OR_NEWER
#elif (UNITY_ANALYTICS) // Implicitly: !UNITY_EDITOR
var info = analytic.info;
Expand Down
5 changes: 5 additions & 0 deletions Packages/com.unity.inputsystem/InputSystem/Unity.InputSystem.asmdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,11 @@
"name": "Unity",
"expression": "6000.0.11",
"define": "UNITY_INPUT_SYSTEM_INPUT_MODULE_SCROLL_DELTA"
},
{
"name": "com.unity.modules.unityanalytics",
"expression": "1",
"define": "UNITY_INPUT_SYSTEM_ENABLE_ANALYTICS"
}
],
"noEngineReferences": false
Expand Down