diff --git a/calculatorpp-main/AndroidManifest.xml b/calculatorpp-main/AndroidManifest.xml index 7bbb28c8..710576a4 100644 --- a/calculatorpp-main/AndroidManifest.xml +++ b/calculatorpp-main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/calculatorpp-main/pom.xml b/calculatorpp-main/pom.xml index 8edf9a48..942aef62 100644 --- a/calculatorpp-main/pom.xml +++ b/calculatorpp-main/pom.xml @@ -5,14 +5,14 @@ org.solovyev.android - calculatorpp - 1.1.4 + calculatorpp-parent + 1.2.34 4.0.0 org.solovyev.android - calculatorpp-main + calculatorpp apk @@ -204,8 +204,8 @@ - ${basedir}/src/misc/env/jarsigner.properties - ${basedir}/src/misc/env/env.properties + ${project.basedir}/src/misc/env/jarsigner.properties + ${project.basedir}/src/misc/env/env.properties @@ -269,13 +269,13 @@ true - ${project.build.directory}/${project.artifactId}.apk + ${project.build.directory}/${project.artifactId}-${project.version}.apk ${sign.keystore} ${sign.alias} ${sign.storepass} ${sign.keypass} - true + false @@ -288,23 +288,27 @@ android-maven-plugin true + false + - true - ${project.build.directory}/${project.artifactId}.apk - ${project.build.directory}/${project.artifactId}-signed-aligned.apk - + false + ${project.build.directory}/${project.artifactId}-${project.version}.apk + ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk + false true + - false + true + manifestUpdate @@ -328,7 +332,7 @@ - ${project.build.directory}/${project.artifactId}-signed-aligned.apk + ${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk apk signed-aligned diff --git a/calculatorpp-test/pom.xml b/calculatorpp-test/pom.xml index 82c82616..7d8c8815 100644 --- a/calculatorpp-test/pom.xml +++ b/calculatorpp-test/pom.xml @@ -5,8 +5,8 @@ org.solovyev.android - calculatorpp - 1.1.4 + calculatorpp-parent + 1.2.34 4.0.0 diff --git a/pom.xml b/pom.xml index 969e772e..cab7f7e8 100644 --- a/pom.xml +++ b/pom.xml @@ -6,9 +6,9 @@ 4.0.0 org.solovyev.android - calculatorpp + calculatorpp-parent pom - 1.1.4 + 1.2.34 ../common