[ROAD-1067] Report macOS version and device model for iOS / Catalyst apps #1055
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Goal
Resolves PLAT-6100 and PLAT-6246
Makes
device.model
,osName
andosVersion
reflect the Mac when running iOS apps via Catalyst or natively on Apple Silicon Macs.Changeset
Fetches the underlying OS version from
/System/Library/CoreServices/SystemVersion.plist
as APIs generally report the simulated iOS version. Had to bypass the usual APIs for reading this because Big Sur has a shim inlibsyscall
that redirects access to this file for iOS apps not built against Catalyst 🤯Switches how
hw.machine
andhw.model
are interpreted according to the underlying OS type so that the "Model Identifier" (e.g.iPhone1,1
orMacBookPro1,1
) ends up in the expected field.Testing
Tested manually using sample app on M1 Mac mini, Mac Catalyst, iOS devices running iOS 9 and 14, and tvOS.