Changes
This commit is contained in:
parent
8f2e240c4e
commit
b55f22ca43
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="34" android:versionName="1.1.4" package="org.solovyev.android.calculator">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="67" android:versionName="1.2.34" package="org.solovyev.android.calculator">
|
||||
|
||||
<uses-permission android:name="android.permission.VIBRATE"/>
|
||||
<uses-permission android:name="android.permission.INTERNET"/>
|
||||
|
@ -5,14 +5,14 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp</artifactId>
|
||||
<version>1.1.4</version>
|
||||
<artifactId>calculatorpp-parent</artifactId>
|
||||
<version>1.2.34</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp-main</artifactId>
|
||||
<artifactId>calculatorpp</artifactId>
|
||||
<packaging>apk</packaging>
|
||||
|
||||
<properties>
|
||||
@ -204,8 +204,8 @@
|
||||
</goals>
|
||||
<configuration>
|
||||
<files>
|
||||
<file>${basedir}/src/misc/env/jarsigner.properties</file>
|
||||
<file>${basedir}/src/misc/env/env.properties</file>
|
||||
<file>${project.basedir}/src/misc/env/jarsigner.properties</file>
|
||||
<file>${project.basedir}/src/misc/env/env.properties</file>
|
||||
</files>
|
||||
</configuration>
|
||||
</execution>
|
||||
@ -269,13 +269,13 @@
|
||||
<removeExistingSignatures>true</removeExistingSignatures>
|
||||
<archiveDirectory/>
|
||||
<includes>
|
||||
<include>${project.build.directory}/${project.artifactId}.apk</include>
|
||||
<include>${project.build.directory}/${project.artifactId}-${project.version}.apk</include>
|
||||
</includes>
|
||||
<keystore>${sign.keystore}</keystore>
|
||||
<alias>${sign.alias}</alias>
|
||||
<storepass>${sign.storepass}</storepass>
|
||||
<keypass>${sign.keypass}</keypass>
|
||||
<verbose>true</verbose>
|
||||
<verbose>false</verbose>
|
||||
</configuration>
|
||||
</execution>
|
||||
</executions>
|
||||
@ -288,23 +288,27 @@
|
||||
<artifactId>android-maven-plugin</artifactId>
|
||||
<inherited>true</inherited>
|
||||
<configuration>
|
||||
|
||||
<sign>
|
||||
<debug>false</debug>
|
||||
</sign>
|
||||
|
||||
<zipalign>
|
||||
<verbose>true</verbose>
|
||||
<inputApk>${project.build.directory}/${project.artifactId}.apk</inputApk>
|
||||
<outputApk>${project.build.directory}/${project.artifactId}-signed-aligned.apk
|
||||
</outputApk>
|
||||
<verbose>false</verbose>
|
||||
<inputApk>${project.build.directory}/${project.artifactId}-${project.version}.apk</inputApk>
|
||||
<outputApk>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk</outputApk>
|
||||
</zipalign>
|
||||
|
||||
<manifest>
|
||||
<debuggable>false</debuggable>
|
||||
<versionCodeAutoIncrement>true</versionCodeAutoIncrement>
|
||||
</manifest>
|
||||
|
||||
<proguard>
|
||||
<skip>false</skip>
|
||||
<skip>true</skip>
|
||||
</proguard>
|
||||
</configuration>
|
||||
|
||||
<executions>
|
||||
<execution>
|
||||
<id>manifestUpdate</id>
|
||||
@ -328,7 +332,7 @@
|
||||
<configuration>
|
||||
<artifacts>
|
||||
<artifact>
|
||||
<file>${project.build.directory}/${project.artifactId}-signed-aligned.apk</file>
|
||||
<file>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk</file>
|
||||
<type>apk</type>
|
||||
<classifier>signed-aligned</classifier>
|
||||
</artifact>
|
||||
|
@ -5,8 +5,8 @@
|
||||
|
||||
<parent>
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp</artifactId>
|
||||
<version>1.1.4</version>
|
||||
<artifactId>calculatorpp-parent</artifactId>
|
||||
<version>1.2.34</version>
|
||||
</parent>
|
||||
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
4
pom.xml
4
pom.xml
@ -6,9 +6,9 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>org.solovyev.android</groupId>
|
||||
<artifactId>calculatorpp</artifactId>
|
||||
<artifactId>calculatorpp-parent</artifactId>
|
||||
<packaging>pom</packaging>
|
||||
<version>1.1.4</version>
|
||||
<version>1.2.34</version>
|
||||
|
||||
<modules>
|
||||
<module>../common</module>
|
||||
|
Loading…
Reference in New Issue
Block a user