From 7836c620b61412fcb67f179bfba733351771cf70 Mon Sep 17 00:00:00 2001
From: Sergey Solovyev <se.solovyev@gmail.com>
Date: Sat, 27 Oct 2012 19:13:34 +0400
Subject: [PATCH] Zipalign is working again

---
 calculatorpp/AndroidManifest.xml | 4 ++--
 calculatorpp/pom.xml             | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/calculatorpp/AndroidManifest.xml b/calculatorpp/AndroidManifest.xml
index d335285b..bc29d671 100644
--- a/calculatorpp/AndroidManifest.xml
+++ b/calculatorpp/AndroidManifest.xml
@@ -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="105" android:versionName="1.4.5-SNAPSHOT" package="org.solovyev.android.calculator">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto" android:versionCode="107" android:versionName="1.4.5-SNAPSHOT" package="org.solovyev.android.calculator">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -9,7 +9,7 @@
 
     <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="8"/>
 
-    <application android:debuggable="true" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme">
+    <application android:debuggable="false" android:hardwareAccelerated="false" android:icon="@drawable/icon" android:label="@string/c_app_name" android:name=".CalculatorApplication" android:theme="@style/metro_blue_theme">
 
         <activity android:clearTaskOnLaunch="true" android:label="@string/c_app_name" android:name=".CalculatorActivity" android:windowSoftInputMode="adjustPan">
 
diff --git a/calculatorpp/pom.xml b/calculatorpp/pom.xml
index 17103e40..75c3aa31 100644
--- a/calculatorpp/pom.xml
+++ b/calculatorpp/pom.xml
@@ -209,9 +209,9 @@
                                 </goals>
                                 <phase>package</phase>
                                 <inherited>true</inherited>
+
                                 <configuration>
                                     <removeExistingSignatures>true</removeExistingSignatures>
-                                    <archiveDirectory />
                                     <includes>
                                         <include>${project.build.directory}/${project.artifactId}-${project.version}.apk</include>
                                     </includes>
@@ -221,6 +221,7 @@
                                     <keypass>${sign.keypass}</keypass>
                                     <verbose>true</verbose>
                                 </configuration>
+
                             </execution>
                         </executions>
                     </plugin>
@@ -238,6 +239,7 @@
                             </sign>
 
                             <zipalign>
+                                <skip>false</skip>
                                 <verbose>true</verbose>
                                 <inputApk>${project.build.directory}/${project.artifactId}-${project.version}.apk</inputApk>
                                 <outputApk>${project.build.directory}/${project.artifactId}-${project.version}-signed-aligned.apk</outputApk>