Fixing IAM on m1 catalyst

[emawby]

Description

One Line Summary

IAMs will no longer be displayed when running for Mac Catalyst on an M1 Mac.

Details

Our logic to not display IAMs on mac catalyst was not working for M1 Macs, because it was directly looking at the architecture. This PR now properly checks the compile target and will not display IAMs for catalyst.

Motivation

bug

Scope

This affects the getDeviceVariant method, which was also incorrect for simulators on M1 Macs.

Testing

Unit testing

I have fixed the unit tests for this, but they now need to be run on specific device targets to test every case since I could not mock the compile target.

Manual testing

I tested on the M1 Mac in the office as well as my intel mac for simulator, catalyst, and device.

Affected code checklist

• Notifications
  • Display
  • Open
  • Push Processing
  • Confirm Deliveries
• Outcomes
• Sessions
• In-App Messaging
• REST API requests
• Public API changes

Checklist

Overview

• I have filled out all REQUIRED sections above
• PR does one thing
  • If it is hard to explain how any codes changes are related to each other then it most likely needs to be more than one PR
• Any Public API changes are explained in the PR details and conform to existing APIs

Testing

• I have included test coverage for these changes, or explained why they are not needed
• All automated tests pass, or I explained why that is not possible
• I have personally tested this on my device, or explained why that is not possible

Final pass

• Code is as readable as possible.
  • Simplify with less code, followed by splitting up code into well named functions and variables, followed by adding comments to the code.
• I have reviewed this PR myself, ensuring it meets each checklist item
  • WIP (Work In Progress) is ok, but explain what is still in progress and what you would like feedback on. Start the PR title with "WIP" to indicate this.

---

This change is 

[jkasten2]

Reviewed 5 of 5 files at r1, all commit messages.
Reviewable status: all files reviewed, 1 unresolved discussion (waiting on @emawby and @nan-li)

---

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m, line 477 at r1 (raw file):

    // x86_64 could mean an iOS Simulator or Catalyst app on macOS
    #if TARGET_OS_MACCATALYST

This will definitely work if this was app code, but this file is part of the xcframework / SwfitPM. Its likely this will also work for library code since xcframeworks do have different target folders. However we have never done this before so we should confirm it does work end-to-end.

[jkasten2]

Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @nan-li)

---

iOS_SDK/OneSignalSDK/Source/OneSignalHelper.m, line 477 at r1 (raw file):

Previously, jkasten2 (Josh Kasten) wrote…

This will definitely work if this was app code, but this file is part of the xcframework / SwfitPM. Its likely this will also work for library code since xcframeworks do have different target folders. However we have never done this before so we should confirm it does work end-to-end.

@emawby Tested, works as expected on mac catalyst, simulator and a iOS device.

[jkasten2]

Reviewable status: complete! all files reviewed, all discussions resolved (waiting on @nan-li)