Create an empty GravatarUCropActivity to avoid Manifest merger fails #398
+27
−6
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
📲 You can test the changes from this Pull Request in Gravatar Demo by scanning the QR code below to install the corresponding build.
|
AdamGrzybkowski
force-pushed
the
adam/ucrop_activity
branch
from
7dde324
to
b282cb4
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
When a third-party app depends on UCrop already they likely have defined the
UCropActivityin the manifest. We do that as well in the QE and this causes the Manifest merger to fail.It's possible to remove that declaration from a third-party app (or use
tools:replace) and keep the one from QE, but it's not ideal because there could be custom fields set that could differ from the ones we use.To fix this I've added a "fake" UCrop activity to not have clashing names. This way we can define our Activity in the manifest without requiring third-party apps to remove theirs.
Testing Steps
I've added a potentially conflicting UCropActivity to the demo app, so the CI should be enough.
I was also able to confirm this in the WP app with the built from this PR.