ReVanced/Apktool
1
0
Fork 0
mirror of https://github.com/revanced/Apktool.git synced 2025-05-03 07:14:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Hardcoded project.version in POMs, removed ${aversion} property.

Browse Source 
Property substitution is not allowed in /project/parent/(groupId|artifactId|version) or in /project/(groupId|artifactId|version) - it sometimes works and sometimes not.
This commit is contained in:
Ryszard Wiśniewski 2011-11-05 00:52:42 +01:00
parent 269870bad6
commit f056603d8c
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apktool-cli/pom.xml
View File

@ -4,7 +4,7 @@
<groupId>brut.apktool</groupId> <groupId>brut.apktool</groupId>
<artifactId>apktool-cli</artifactId> <artifactId>apktool-cli</artifactId>
<version>${aversion}</version> <version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>
@ -47,9 +47,9 @@
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>brut.apktool</groupId> <groupId>${project.groupId}</groupId>
<artifactId>apktool-lib</artifactId> <artifactId>apktool-lib</artifactId>
<version>${aversion}</version> <version>${project.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>
</project> </project>

2
apktool-lib/pom.xml
View File

@ -4,7 +4,7 @@
<groupId>brut.apktool</groupId> <groupId>brut.apktool</groupId>
<artifactId>apktool-lib</artifactId> <artifactId>apktool-lib</artifactId>
<version>${aversion}</version> <version>1.4.2-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<parent> <parent>

2
apktool-lib/src/main/java/brut/androlib/Androlib.java
View File

@ -375,7 +375,7 @@ public class Androlib {
} }
public static String getVersion() { public static String getVersion() {
String version = ApktoolProperties.get("aversion"); String version = ApktoolProperties.get("version");
return version.endsWith("-SNAPSHOT") ? return version.endsWith("-SNAPSHOT") ?
version.substring(0, version.length() - 9) + '.' + version.substring(0, version.length() - 9) + '.' +
ApktoolProperties.get("git.commit.id.abbrev") ApktoolProperties.get("git.commit.id.abbrev")

2
apktool-lib/src/main/resources/brut/androlib/apktool.properties
View File

@ -1,2 +1,2 @@
aversion = ${aversion} version = ${project.version}
git.commit.id.abbrev = ${git.commit.id.abbrev} git.commit.id.abbrev = ${git.commit.id.abbrev}

1
pom.xml
View File

@ -11,7 +11,6 @@
<url>http://github.com/brutall/brut.apktool</url> <url>http://github.com/brutall/brut.apktool</url>
<properties> <properties>
<aversion>1.4.2-SNAPSHOT</aversion>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<root.basedir>${basedir}</root.basedir> <root.basedir>${basedir}</root.basedir>
</properties> </properties>