updating build paths and external project versions

proguard-project.txt

@@ -1,36 +1,20 @@
--optimizationpasses 5
--dontusemixedcaseclassnames
--dontskipnonpubliclibraryclasses
--dontpreverify
--verbose
--optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+# To enable ProGuard in your project, edit project.properties
+# to define the proguard.config property as described in that file.
+#
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in ${sdk.dir}/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the ProGuard
+# include property in project.properties.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
 
--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 com.android.vending.licensing.ILicensingService
+# Add any project specific keep options here:
 
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
--keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet); 
-}
-
--keepclasseswithmembernames class * {
-    public <init>(android.content.Context, android.util.AttributeSet, int); 
-}
-
--keepclassmembers enum * {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
--libraryjars libs/asmack-android-4.jar  
--libraryjars libs/commons-codec.jar  
--libraryjars libs/gp-bcc-lib.jar  
--libraryjars libs/guava-r09.jar  
--libraryjars libs/jsoup-1.5.2.jar
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}

project.properties

@@ -11,7 +11,7 @@
 split.density=false
 # Project target.
 target=android-17
-android.library.reference.1=external/ActionBarSherlock/library
+android.library.reference.1=external/ActionBarSherlock/actionbarsherlock
 android.library.reference.2=external/MemorizingTrustManager
-android.library.reference.3=external/OnionKit/library
+android.library.reference.3=external/OnionKit/libonionkit
 #proguard.config=proguard-project.txt

update-ant-build.sh

@@ -2,6 +2,6 @@
 
 # make sure your Android SDK tools path is set in SDK_BASE
 android update project --path . --name Gibberbot --subprojects
-android update project --path external/ActionBarSherlock/library/ --name ActionBarSherlock
-android update project --path external/MemorizingTrustManager --name MemorizingTrustManager --subprojects
-android update project --path external/OnionKit/library --name OnionKit
+android update project --path external/ActionBarSherlock/actionbarsherlock -t android-17
+android update project --path external/MemorizingTrustManager --name MemorizingTrustManager -t android-17 --subprojects
+android update project --path external/OnionKit/libonionkit --name OnionKit -t android-17