Merge main to staging and resolve conflicts #487
Merged
Conversation
This file contains hidden or 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
* build error optimize read me updated * optimize note added * enable TVOS platform for Edge Bridge enable TVOS platform for Edge Bridge * update app podfile to the latest versions update app podfile to the latest versions * updated optimize read me for build errors * location services updates (adobe#475) * location services updates * places version bump * Expo 52 sample app updated (adobe#471) * expo 52 upgrade android build working * expo 52 ios fixes along with splash screen freeze issue fixes * pod file and yarn lock fixes * updated yarn lock and other copyright comment * added plugin for jetifier configuration * Remove android and ios folders from Git tracking for AEPSampleAppNewArchEnabled * ios and android folder added to git ignore * Revert "added plugin for jetifier configuration" This reverts commit de0ffb2. * added expo prebuild command * read me expo sample app updated --------- Co-authored-by: Naman Arora <namarora+adobe@adobe.com> * expo simplification doc update (adobe#473) * removed registeration of sdks * Update expo.md with expo to support CNG with static frameworks configuration * addressed review comments and made relevant changes in read me * Added a note for Expo support in Installation Guide. --------- Co-authored-by: akhiljain1907 <akhiljain@adobe.com> --------- Co-authored-by: Calise Cheung <cacheung@adobe.com> Co-authored-by: Naman Arora <namarora+adobe@adobe.com> Co-authored-by: akhiljain1907 <akhiljain@adobe.com>
* docs: 📝 adds content cards tutorial * diff
* docs: 📝 adds content cards tutorial * docs: 📝 adds docs for content card tracking
namArora3112
approved these changes
Jun 9, 2025
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
Related Issue
Motivation and Context
How Has This Been Tested?
Screenshots (if appropriate):
Types of changes
Checklist: