Merge major_release_5.0.0 into the main branch #1331
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Release 5.0.0 alpha 01
* calculateIsOptedIn and calculateIsEnabled were not actually using the passed in arguments
* The anonymous user has been identified, but we still need to Fetch User as we cleared local data * This will hydrate the onesignal_id again as well as other user properties
…gration_guide migration guide alpha-01: update SDK install instructions
[user model] Fix firing the push subscription observer
Fix 5.0.0 onesignal podspec
…and_push_observer [user model] fix bug in identify user: need to fetch
Live activity support 5.0.0
Release 5.0.1
Update migration guide
* Fix a bug in setting an appId that is retrieved from cache. We were overwriting it with nil or "" after reading from cache. * Additionally, remove `appId` property from the OneSignal class because we can manage the appId via the `OneSignalConfigManager`. Better not to have two sources of truth for appId. * Remove `kOSSettingsKeyInOmitNoAppIdLogging` as it does not appear to be used anymore * Nit: clarifying logs
[Fix] Remove embed bitcode flag
…rappers Fix bug when setting app_id from cache
Release 5.0.2
Cherry picked from #1131
[v5] Fix crash with direct influence but nil direct id
…non_onesignal_notifs [v5] Fix forwarding notification opens from non onesignal notifs
nan-li
force-pushed
the
major_release_5.0.0_rebased_with_main
branch
from
043647e to
3df15d0
Compare
After rebasing `major_release_5.0.0` onto the `main` branch, some commits from the `major_release_5.0.0` branch are applied inappropriately, leaving the SDK in a erroneous state after the rebase. For example, project files and storyboard files easily ended in a weird state. Or, changes that already existed in `main` are added again when their equivalent commit in the `major_release_5.0.0` branch is added. This commit makes compares the rebased product to major_release_5.0.0 and make them essentially equivalent.
nan-li
force-pushed
the
major_release_5.0.0_rebased_with_main
branch
from
3df15d0 to
6a6b075
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
One Line Summary
This PR rebased all commits from major_release_5.0.0 and apply them to the main branch.
Details
See https://github.com/OneSignal/OneSignal-iOS-SDK/compare/429c258..6a6b075 for a comparison of this branch vs
major_release_5.0.0. After this PR,mainandmajor_release_5.0.0should be equivalent.Motivation
To make the main branch reflect v5.x.x. The "old" main branch is maintained in branch
3.X.X.Testing
Unit testing
None
Manual testing
Running example app on iPhone with iOS 17 to ensure SDK builds and runs.
Affected code checklist
Checklist
Overview
Testing
Final pass
This change is