TnSb/android-calculatorpp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changes

Browse Source
This commit is contained in:
Sergey Solovyev 2012-03-05 00:54:56 +04:00
parent 8f2e240c4e
commit b55f22ca43
4 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
calculatorpp-main/AndroidManifest.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?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.VIBRATE"/>
<uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.INTERNET"/>

30
calculatorpp-main/pom.xml
View File

@ -5,14 +5,14 @@
<parent> <parent>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp</artifactId> <artifactId>calculatorpp-parent</artifactId>
<version>1.1.4</version> <version>1.2.34</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp-main</artifactId> <artifactId>calculatorpp</artifactId>
<packaging>apk</packaging> <packaging>apk</packaging>
<properties> <properties>
@ -204,8 +204,8 @@
</goals> </goals>
<configuration> <configuration>
<files> <files>
<file>${basedir}/src/misc/env/jarsigner.properties</file> <file>${project.basedir}/src/misc/env/jarsigner.properties</file>
<file>${basedir}/src/misc/env/env.properties</file> <file>${project.basedir}/src/misc/env/env.properties</file>
</files> </files>
</configuration> </configuration>
</execution> </execution>
@ -269,13 +269,13 @@
<removeExistingSignatures>true</removeExistingSignatures> <removeExistingSignatures>true</removeExistingSignatures>
<archiveDirectory/> <archiveDirectory/>
<includes> <includes>
<include>${project.build.directory}/${project.artifactId}.apk</include> <include>${project.build.directory}/${project.artifactId}-${project.version}.apk</include>
</includes> </includes>
<keystore>${sign.keystore}</keystore> <keystore>${sign.keystore}</keystore>
<alias>${sign.alias}</alias> <alias>${sign.alias}</alias>
<storepass>${sign.storepass}</storepass> <storepass>${sign.storepass}</storepass>
<keypass>${sign.keypass}</keypass> <keypass>${sign.keypass}</keypass>
<verbose>true</verbose> <verbose>false</verbose>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -288,23 +288,27 @@
<artifactId>android-maven-plugin</artifactId> <artifactId>android-maven-plugin</artifactId>
<inherited>true</inherited> <inherited>true</inherited>
<configuration> <configuration>
<sign> <sign>
<debug>false</debug> <debug>false</debug>
</sign> </sign>
<zipalign> <zipalign>
<verbose>true</verbose> <verbose>false</verbose>
<inputApk>${project.build.directory}/${project.artifactId}.apk</inputApk> <inputApk>${project.build.directory}/${project.artifactId}-${project.version}.apk</inputApk>
<outputApk>${project.build.directory}/${project.artifactId}-signed-aligned.apk <outputApk>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk</outputApk>
</outputApk>
</zipalign> </zipalign>
<manifest> <manifest>
<debuggable>false</debuggable> <debuggable>false</debuggable>
<versionCodeAutoIncrement>true</versionCodeAutoIncrement> <versionCodeAutoIncrement>true</versionCodeAutoIncrement>
</manifest> </manifest>
<proguard> <proguard>
<skip>false</skip> <skip>true</skip>
</proguard> </proguard>
</configuration> </configuration>
<executions> <executions>
<execution> <execution>
<id>manifestUpdate</id> <id>manifestUpdate</id>
@ -328,7 +332,7 @@
<configuration> <configuration>
<artifacts> <artifacts>
<artifact> <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> <type>apk</type>
<classifier>signed-aligned</classifier> <classifier>signed-aligned</classifier>
</artifact> </artifact>

4
calculatorpp-test/pom.xml
View File

@ -5,8 +5,8 @@
<parent> <parent>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp</artifactId> <artifactId>calculatorpp-parent</artifactId>
<version>1.1.4</version> <version>1.2.34</version>
</parent> </parent>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>

4
pom.xml
View File

@ -6,9 +6,9 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>org.solovyev.android</groupId> <groupId>org.solovyev.android</groupId>
<artifactId>calculatorpp</artifactId> <artifactId>calculatorpp-parent</artifactId>
<packaging>pom</packaging> <packaging>pom</packaging>
<version>1.1.4</version> <version>1.2.34</version>
<modules> <modules>
<module>../common</module> <module>../common</module>