Updated Manifest Merge functionality to support SDK Tools R21. #146
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
Added support for SDK Tools R21.
mosabua
added a commit
that referenced
this pull request
Nov 16, 2012
Updated Manifest Merge functionality to support SDK Tools R21.
| { | ||
| try | ||
| { | ||
| toolsVersion = Integer.parseInt( properties.getProperty( SDK_TOOLS_REVISION_PROPERTY ) ); |
There was a problem hiding this comment.
This breaks for older release since it is actually a version String like 20.0.1. I will fix it and push a fix out.
There was a problem hiding this comment.
This is now fixed in master hopefully. Please check out my changes and test them for your use case..
There was a problem hiding this comment.
Thanks! You da Man.
Tom
Sent from my iPhone
On Nov 16, 2012, at 1:49 PM, Manfred Moser notifications@github.com wrote:
In src/main/java/com/jayway/maven/plugins/android/AndroidSdk.java:
File propFile = new File( sdkPath, "tools/" + SOURCE_PROPERTIES_FILENAME );Properties properties = new Properties();try{properties.load( new FileInputStream( propFile ) );}catch ( IOException e ){throw new InvalidSdkException( "Error reading " + propFile.getAbsoluteFile() );}
if ( properties.containsKey( SDK_TOOLS_REVISION_PROPERTY ) ){try{toolsVersion = Integer.parseInt( properties.getProperty( SDK_TOOLS_REVISION_PROPERTY ) );
This is now fixed in master hopefully. Please check out my changes and test
them for your use case..
—
Reply to this email directly or view it on
GitHubhttps://github.com//pull/146/files#r2156065.
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.
Added support for SDK Tools R21.
I updated the Manifest merging code to check the Tools version in the ANDROID_HOME/tools/source.properties file. Based on the version a factory will return a manifest strategy class that has all the reflection to get the correct classes and will execute the merge.
I also moved the merge classes to a separate package to help keep them organized.