fix: move com.google.android conflicts to com.android #3
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.
Was trying to do a release build while testing our CI for the package manager changes and was running into a bunch of these
DexArchiveMergerException
issues (note: these only happen for release builds which is why no one has noticed it, this is also an issue in thelp3
branch), so I took some inspo from this commit of @hhff's and just moved the classes with conflicts to a different package. This resolves the issue but I wasn't sure if there was a better way to go about it, so please let me know if there is.More context in this thread: https://twist.com/a/133876/ch/352130/t/6367409/
To test this locally you can just
cd
into the androidsmsmms submodule and checkout this branch from there. You can then revert this by runninggit pull --recurse-submodules
.