Updated support library and target sdk

trongtd1988 · Sep 5, 2013 · 2bfaaf7 · 2bfaaf7
1 parent 6f1ccfb
commit 2bfaaf7
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 3 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="9"
-        android:targetSdkVersion="14" />
+        android:targetSdkVersion="18" />
 
     <uses-feature android:name="android.hardware.camera" />
     <uses-feature android:name="android.hardware.camera.autofocus" />

diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
diff --git a/proguard-project.txt b/proguard-project.txt
@@ -18,3 +18,33 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+
+
+-dontwarn org.spongycastle.x509.util.LDAPStoreHelper
+-dontwarn org.spongycastle.jce.provider.X509LDAPCertStoreSpi
+
+-keep public class net.majorkernelpanic.http.* {
+	*;
+}
+
+-keepclassmembers class **.R$* {
+    public static <fields>;
+}
+
+-keep class **.R$*
+
+-keep public class org.spongycastle.jcajce.provider.** {
+	*;
+}
+
+-keep public class org.spongycastle.jce.provider.JCEBlockCipher$PBEWithSHAAndTwofish {
+	*;
+}
+
+-keep public class org.spongycastle.jce.provider.JCESecretKeyFactory$PBEWithSHAAndDES3Key {
+	*;
+}
+
+-keep public class org.spongycastle.jce.provider.JCESecretKeyFactory$PBEWithSHAAndTwofish {
+	*;
+}
diff --git a/project.properties b/project.properties
@@ -8,5 +8,5 @@
 # project structure.
 
 # Project target.
-target=android-17
-proguard.config=proguard.cfg
+target=android-18
+proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt