cleanup new lines and fixup revision properties

This commit is contained in:
Connor Tumbleson 2014-02-04 09:52:09 -06:00
parent a91e87bb04
commit dc2b2fecb8
2 changed files with 1 additions and 5 deletions

View File

@ -651,10 +651,7 @@ public class Androlib {
} }
public static String getVersion() { public static String getVersion() {
String version = ApktoolProperties.get("application.version"); return ApktoolProperties.get("application.version");
return version.endsWith("-SNAPSHOT") ? version.substring(0,
version.length() - 9)
+ '.' + ApktoolProperties.get("git.commit.id.abbrev") : version;
} }
private File[] parseUsesFramework(Map<String, Object> usesFramework) private File[] parseUsesFramework(Map<String, Object> usesFramework)

View File

@ -62,7 +62,6 @@ public class ApktoolProperties {
} }
sProps.put("baksmaliVersion", version); sProps.put("baksmaliVersion", version);
templateStream = main.class.getClassLoader().getResourceAsStream("smali.properties"); templateStream = main.class.getClassLoader().getResourceAsStream("smali.properties");
properties = new Properties(); properties = new Properties();
version = "(unknown)"; version = "(unknown)";