This repository was archived by the owner on Feb 26, 2023. It is now read-only.
Support Android Build Plugin 3.3.0-beta1#2174
Merged
WonderCsabo merged 2 commits intoandroidannotations:developfrom Oct 25, 2018
dodgex:2173_support_android_build_plugin_3_3
Merged
Support Android Build Plugin 3.3.0-beta1#2174WonderCsabo merged 2 commits intoandroidannotations:developfrom dodgex:2173_support_android_build_plugin_3_3
WonderCsabo merged 2 commits intoandroidannotations:developfrom
dodgex:2173_support_android_build_plugin_3_3
Conversation
WonderCsabo
suggested changes
Oct 23, 2018
| addPossibleSplitLocations(basePath, possibleLocation, possibleLocations); | ||
| String possibleLocationWithoutProcessManifest = BUILD_TOOLS_V32_MANIFEST_PATH + "/" + variantPart; | ||
| String possibleLocationWithProcessManifest = possibleLocationWithoutProcessManifest + "/process" + upperCaseFirst(variantPart) + "Manifest/merged"; | ||
| if (new File(basePath, possibleLocationWithoutProcessManifest).isDirectory()) { |
Member
There was a problem hiding this comment.
Should we extract this to a method? The two ifs are doing the same if I am seeing it right.
Member
Author
|
PR updated |
WonderCsabo
approved these changes
Oct 25, 2018
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 free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
2 participants
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.
Google once again moved the location of merged AndroidManifest.xml... this PR allows AA to find the Manifest in its new location.
Tested with
3.3.0-beta01and3.4.0-alpha02See #2173