diff --git a/ant.properties b/ant.properties
new file mode 100644
index 000000000..cfc6e1ad4
--- /dev/null
+++ b/ant.properties
@@ -0,0 +1,23 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in Version Control Systems, as it is
+# integral to the build system of your project.
+
+# This file is only used by the Ant script.
+
+# You can use this to override default values such as
+# 'source.dir' for the location of your java source folder and
+# 'out.dir' for the location of your output folder.
+
+# You can also use it define how the release builds are signed by declaring
+# the following properties:
+# 'key.store' for the location of your keystore and
+# 'key.alias' for the name of the key to use.
+# The password will be asked during the build when you use the 'release' target.
+
+# Indicates whether an apk should be generated for each density.
+split.density=false
+java.encoding=utf8
+# Project target.
+target=android-9
+extensible.libs.classpath=compile-only-libs
diff --git a/build.properties b/build.properties
deleted file mode 100644
index 7b7f4a0a4..000000000
--- a/build.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-application-package=com.fsck.k9
-target=android-9
diff --git a/build.xml b/build.xml
index 33344aaf4..5eac31a6e 100644
--- a/build.xml
+++ b/build.xml
@@ -1,15 +1,14 @@
-
-
+
+
-
-
+
-
-
+
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
- Building version number ${version-name}
+
+
-
- Setting version to ${version-name}
- You can't set the version without passing -Dversion-name=1.234
-
-
-
-
-
-
-
+
-
- Bumping K-9 to ${version-name}
-
+ To customize existing targets, there are two options:
+ - Customize only one target:
+ - copy/paste the target into this file, *before* the
+ task.
+ - customize it to your needs.
+ - Customize the whole content of build.xml
+ - copy/paste the content of the rules files (minus the top node)
+ into this file, replacing the task.
+ - customize to your needs.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ ***********************
+ ****** IMPORTANT ******
+ ***********************
+ In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+ in order to avoid having your file be overridden by tools such as "android update project"
+ -->
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Building version number ${version-name}
+
+
+
+
+
+
+ Building version number ${version-name}
+
+
+
+ Setting version to ${version-name}
+ You can't set the version without passing -Dversion-name=1.234
+
+
+
+
+
+
+
+
+
+
+ Bumping K-9 to ${version-name}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- Creating library ${rclib} for remote control
- applications
-
-
+
+ Creating library ${rclib} for remote control applications
+
-
Uploading to Google Code using Google::Code::Upload
@@ -125,7 +159,7 @@
-
+
Installing ${out.debug.file} onto default emulator...
@@ -134,12 +168,20 @@
+
+
+ Reinstalling ${out.debug.file} onto default emulator...
+
+
+
+
+
+
-
-
+
@@ -160,28 +202,7 @@
Bumps the project version to 3.123,tags and commits it
astyle: Make K-9's source look like it's supposed to
eclipse: Apply template Eclipse settings
-
-
-
-
-
+
@@ -189,4 +210,7 @@
+
+
+
diff --git a/proguard.cfg b/proguard.cfg
new file mode 100644
index 000000000..b1cdf17b5
--- /dev/null
+++ b/proguard.cfg
@@ -0,0 +1,40 @@
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
+-dontpreverify
+-verbose
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+
+-keep public class * extends android.app.Activity
+-keep public class * extends android.app.Application
+-keep public class * extends android.app.Service
+-keep public class * extends android.content.BroadcastReceiver
+-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
+-keep public class com.android.vending.licensing.ILicensingService
+
+-keepclasseswithmembernames class * {
+ native ;
+}
+
+-keepclasseswithmembers class * {
+ public (android.content.Context, android.util.AttributeSet);
+}
+
+-keepclasseswithmembers class * {
+ public (android.content.Context, android.util.AttributeSet, int);
+}
+
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
+-keepclassmembers enum * {
+ public static **[] values();
+ public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+ public static final android.os.Parcelable$Creator *;
+}
diff --git a/default.properties b/project.properties
similarity index 81%
rename from default.properties
rename to project.properties
index 8fc4bac37..213821e1f 100644
--- a/default.properties
+++ b/project.properties
@@ -1,15 +1,15 @@
# This file is automatically generated by Android Tools.
# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
+#
# This file must be checked in Version Control Systems.
-#
+#
# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
# project structure.
# Indicates whether an apk should be generated for each density.
split.density=false
-# Project target.
-target=android-10
-extensible.libs.classpath=compile-only-libs
java.encoding=utf8
+# Project target.
+target=android-9
+extensible.libs.classpath=compile-only-libs
diff --git a/tests/build.properties b/tests/ant.properties
similarity index 100%
rename from tests/build.properties
rename to tests/ant.properties
diff --git a/tests/build.xml b/tests/build.xml
index 52538703e..7dd7a7b59 100644
--- a/tests/build.xml
+++ b/tests/build.xml
@@ -1,15 +1,14 @@
-
+
-
-
+
+
-
-
+
-
-
+
-
-
-
-
-
-
+
+
-
@@ -53,32 +54,32 @@
- [This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir}]
+ /* This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir} */
-->
-
-
-
+
+
diff --git a/tests/proguard.cfg b/tests/proguard.cfg
index 12dd0392c..b1cdf17b5 100644
--- a/tests/proguard.cfg
+++ b/tests/proguard.cfg
@@ -18,14 +18,18 @@
native ;
}
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
public (android.content.Context, android.util.AttributeSet);
}
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
public (android.content.Context, android.util.AttributeSet, int);
}
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
diff --git a/tests/default.properties b/tests/project.properties
similarity index 80%
rename from tests/default.properties
rename to tests/project.properties
index 66db0d159..f049142c1 100644
--- a/tests/default.properties
+++ b/tests/project.properties
@@ -4,7 +4,7 @@
# This file must be checked in Version Control Systems.
#
# To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
# project structure.
# Project target.