Updated ProGuard rules

modular-ftc · Oct 31, 2017 · 2eb1e09 · 2eb1e09
1 parent 47aae2c
commit 2eb1e09
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 5 deletions.
diff --git a/library/build.gradle b/library/build.gradle
@@ -6,8 +6,8 @@ android {
  defaultConfig {
  minSdkVersion 19
  targetSdkVersion 19
- versionCode 1
- versionName "3.4"
+ versionCode 2
+ versionName "3.4.1"
  testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
  ndk {

diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro
@@ -20,7 +20,41 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
-#Keep all Vuforia data
--keep,includedescriptorclasses class com.vuforia.** {
+#Keep all Qualcomm RobotCore data
+-keep,includedescriptorclasses class com.qualcomm.robotcore.** {
  *;
-}
+}
+#Keep all FIRST RobotCore data
+-keep,includedescriptorclasses class org.firstinspires.ftc.robotcore.** {
+ *;
+}
+#Keep all HTTPD data
+-keep,includedescriptorclasses class org.firstinspires.ftc.robotcore.** {
+ *;
+}
+
+-dontwarn com.sun.tools.**
+-dontwarn com.google.common.**
+
+##---------------Begin: proguard configuration for Gson ----------
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+# Gson specific classes
+-dontwarn sun.misc.**
+#-keep class com.google.gson.stream.** { *; }
+
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.google.gson.examples.android.model.** { *; }
+
+# Prevent proguard from stripping interface information from TypeAdapterFactory,
+# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
+-keep class * implements com.google.gson.TypeAdapterFactory
+-keep class * implements com.google.gson.JsonSerializer
+-keep class * implements com.google.gson.JsonDeserializer
+
+##---------------End: proguard configuration for Gson ----------