Uh oh!
There was an error while loading. Please reload this page.
fix: check for main manifest if multiple are present - #2174
Merged
thymikee merged 2 commits intoNov 24, 2023
Merged
Conversation
WoLewicki
commented
Nov 23, 2023
ContributorAuthor
Gradle has a mechanism of merging the manifests, so if we could somehow reuse it, then it would most probably be a more general fix for weird package structures. |
cortinico
approved these changes
Nov 23, 2023
cortinico
approved these changes
Nov 23, 2023
szymonrybczak
approved these changes
Nov 23, 2023
szymonrybczak
left a comment
Collaborator
There was a problem hiding this comment.
Thank you! 🙌 Mind adding tests? 🙏
j-piasecki
commented
Nov 24, 2023
Contributor
I've added a test case resembling a setup that's the reason for this PR. LMK if it's enough or if you want to cover other scenarios as well. |
Uh oh!
There was an error while loading. Please reload this page.
50 tasks
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
Sign up for freeto 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.
Summary:
This PR fixes a newly introduced (#1967) problem that having multiple build flavors in app causes the
findManifestscript to take the first found one. We think it seems more reasonable to take the one frommainfolder, if present. It fixes the error inExpensifyapp, wheree2emanifest is the first found one, and theMainActivityis present in themainfolder'sAndroidManifest.xml. It throws such error then:Test Plan:
Make a simple app with
activitytag insidemainAndroidManifest.xmland add a directory e.g.e2ewith otherAndroidManifest.xml, which should have theactivitymerged from themain. It will cause the error on gradle sync in RN 0.73.xChecklist