update build.xml for r14 SDK

ant.properties

@@ -1,13 +1,13 @@
 # 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-folder' for the location of your java source folder and
-#  'out-folder' for the location of your output folder.
+#  '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:
@@ -15,6 +15,4 @@
 #  'key.alias' for the name of the key to use.
 # The password will be asked during the build when you use the 'release' target.
 
-# The name of your application package as defined in the manifest.
-# Used by the 'uninstall' rule.
 application-package=org.aprsdroid.app

build.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project name="APRSdroid" default="help">
 
-<!-- The local.properties file is created and updated by the 'android'
-     tool.
-     It contains the path to the SDK. It should *NOT* be checked into
-     Version Control Systems. -->
-    <property file="local.properties" />
+    <!-- The local.properties file is created and updated by the 'android' tool.
+         It contains the path to the SDK. It should *NOT* be checked into
+         Version Control Systems. -->
+    <loadproperties srcFile="local.properties" />
 
-    <!-- The build.properties file can be created by you and is never touched
-         by the 'android' tool. This is the place to change some of the
-         default property values used by the Ant rules.
+    <!-- The ant.properties file can be created by you. It is only edited by the
+         'android' tool to add properties to it.
+         This is the place to change some Ant specific build properties.
          Here are some properties you may want to change/update:
 
          source.dir
@@ -17,6 +16,9 @@
          out.dir
              The name of the output directory. Default is 'bin'.
 
+         For other overridable properties, look at the beginning of the rules
+         files in the SDK, at tools/ant/build.xml
+
          Properties related to the SDK location or the project target should
          be updated using the 'android' tool with the 'update' action.
 
@@ -24,26 +26,25 @@
          application and should be checked into Version Control Systems.
 
          -->
-    <property file="build.properties" />
+    <property file="ant.properties" />
 
-    <!-- The default.properties file is created and updated by the 'android'
+    <!-- The project.properties file is created and updated by the 'android'
          tool, as well as ADT.
+
+         This contains project specific properties such as project target, and library
+         dependencies. Lower level build properties are stored in ant.properties
+         (or in .classpath for Eclipse projects).
+
          This file is an integral part of the build system for your
          application and should be checked into Version Control Systems. -->
-    <property file="default.properties" />
+    <loadproperties srcFile="project.properties" />
 
-    <!-- Custom Android task to deal with the project target, and import the
-         proper rules.
-         This requires ant 1.6.0 or above. -->
-    <path id="android.antlibs">
-        <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
-        <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
-    </path>
+    <!-- quick check on sdk.dir -->
+    <fail
+            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+            unless="sdk.dir"
+    />
 
-    <taskdef name="setup"
-        classname="com.android.ant.SetupTask"
-        classpathref="android.antlibs" />
 
 <!-- extension targets. Uncomment the ones where you want to do custom work
      in between standard targets -->
@@ -77,33 +78,33 @@
     <target name="-pre-compile">
     </target>
 
-    [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} */
 -->
     <target name="-post-compile" depends="scalac, proguard">
     </target>
 
-
-    <!-- Execute the Android Setup task that will setup some properties
-         specific to the target, and import the build rules files.
-
-         The rules file is imported from
-            <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+    <!-- Import the actual build file.
 
          To customize existing targets, there are two options:
          - Customize only one target:
              - copy/paste the target into this file, *before* the
-               <setup> task.
+               <import> task.
              - customize it to your needs.
-         - Customize the whole script.
+         - Customize the whole content of build.xml
              - copy/paste the content of the rules files (minus the top node)
-               into this file, *after* the <setup> task
-             - disable the import of the rules by changing the setup task
-               below to <setup import="false" />. 
+               into this file, replacing the <import> 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"
     -->
-    <setup />
+    <!-- version-tag: custom -->
+    <import file="${sdk.dir}/tools/ant/build.xml" />
 
     <target name="check-scalalib">
         <available file="tools/scala-library.jar" property="have.scalalib"/>
@@ -114,7 +115,7 @@
 	<fail unless="have.scalac">You have to place scala-compiler.jar and scala-library.jar to tools/</fail>
     </target>
 
-    <target name="scalac" depends="compile, check-scalalib, check-scalac">
+    <target name="scalac" depends="-compile, check-scalalib, check-scalac">
 	<taskdef resource="scala/tools/ant/antlib.xml"
 	    classpath="tools/scala-compiler.jar:tools/scala-library.jar" />
 	<scalac force="changed" deprecation="on"
@@ -135,7 +136,7 @@
     </target>
 
     <property name="optimized.dir" value="${out.absolute.dir}/optimized" />
-    <target name="proguard" depends="compile, scalac, check-proguard">
+    <target name="proguard" depends="scalac, check-proguard">
 	<taskdef resource="proguard/ant/task.properties"
 	    classpath="tools/proguard.jar" />
 	<mkdir dir="${optimized.dir}" />

proguard.cfg

@@ -1,12 +1,18 @@
 -dontwarn scala.**
 -dontnote scala.**
 -dontobfuscate
+-optimizationpasses 5
+-dontusemixedcaseclassnames
+-dontskipnonpubliclibraryclasses
 -dontpreverify
--repackageclasses ''
 -allowaccessmodification
 -optimizations !code/simplification/arithmetic,!code/allocation/variable
 -keepattributes *Annotation*
+-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
 -keepclassmembers class * extends android.os.AsyncTask {
 	protected void onPreExecute();
@@ -20,20 +26,39 @@
 	public <init>(android.content.Context, android.util.AttributeSet, int);
 	public void set*(...);
 }
+-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 <methods>;
+}
+
 -keepclasseswithmembers class * {
-	public <init>(android.content.Context, android.util.AttributeSet);
+    public <init>(android.content.Context, android.util.AttributeSet);
 }
+
 -keepclasseswithmembers class * {
-	public <init>(android.content.Context, android.util.AttributeSet, int);
+    public <init>(android.content.Context, android.util.AttributeSet, int);
 }
--keepclassmembers class * implements android.os.Parcelable {
-	static android.os.Parcelable$Creator CREATOR;
+
+-keepclassmembers class * extends android.app.Activity {
+   public void *(android.view.View);
 }
+
 -keepclassmembers class **.R$* {
 	public static <fields>;
 }
 -keep public interface scala.ScalaObject
--dontskipnonpubliclibraryclasses
--dontskipnonpubliclibraryclassmembers
--allowaccessmodification
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
+
+-keep class * implements android.os.Parcelable {
+  public static final android.os.Parcelable$Creator *;
+}
 

project.properties

@@ -1,11 +1,11 @@
 # 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.
 
-# Project target: Android 1.6
+# Project target.
 target=Google Inc.:Google APIs:8