From 89e1b92edac60952363caeaa2f312250f7fdc09c Mon Sep 17 00:00:00 2001
From: shuyu <359369982@qq.com>
Date: Sat, 3 Dec 2016 14:11:43 +0800
Subject: [PATCH] 1.3.8 add version code and minifyEnabled

---
 app/build.gradle                              |  10 ++-
 app/proguard-rules.pro                        |  66 ++++++++++++++++++
 .../compile-file-map.properties               |   2 +-
 .../compile-file-map.properties               |   2 +-
 .../compile-file-map.properties               |   2 +-
 .../res/resources-debug-androidTest.ap_       | Bin 764 -> 764 bytes
 6 files changed, 77 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 65565db..cf14b5b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         minSdkVersion globalConfiguration.androidMinSdkVersion
         targetSdkVersion globalConfiguration.androidTargetSdkVersion
 
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.3.8"
 
 
         ndk {
@@ -25,10 +25,16 @@ android {
     }
 
     buildTypes {
+
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 }
 
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index 960a348..39b7c73 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -15,3 +15,69 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
+# 指定代码的压缩级别
+-optimizationpasses 5
+# 是否使用大小写混合
+-dontusemixedcaseclassnames
+# 是否混淆第三方jar
+-dontskipnonpubliclibraryclasses
+# 混淆时是否做预校验
+-dontpreverify
+# 混淆时是否记录日志
+-verbose
+# 混淆时所采用的算法
+-optimizations !code/simplification/arithmetic,!field/*,!class/merging/*
+-ignorewarnings
+#-ignorewarnings
+-keepattributes *Annotation*
+-keepattributes Signature
+-keepattributes SourceFile,LineNumberTable
+-keepattributes Exceptions,InnerClasses,Deprecated,LocalVariable*Table,Synthetic,EnclosingMethod
+-keepattributes EnclosingMethod
+
+# Keep native methods
+-keepclassmembers class * {
+    native <methods>;
+}
+
+
+-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+   public *;
+}
+
+
+-keepclassmembers class * implements java.io.Serializable {
+    static final long serialVersionUID;
+    private static final java.io.ObjectStreamField[] serialPersistentFields;
+    private void writeObject(java.io.ObjectOutputStream);
+    private void readObject(java.io.ObjectInputStream);
+    java.lang.Object writeReplace();
+    java.lang.Object readResolve();
+}
+
+-keep public class * implements java.io.Serializable {
+    public *;
+}
+
+-keep class **.R$*{
+    *;
+}
+
+-keepclassmembers class * {
+   public <init>(org.json.JSONObject);
+}
+
+-keepclasseswithmembernames class * {
+native <methods>;
+}
+
+-keepclassmembers enum * {
+public static **[] values();
+public static ** valueOf(java.lang.String);
+}
+
+
+-keep class com.shuyu.gsyvideoplayer.** { *; }
+-dontwarn com.shuyu.gsyvideoplayer.**
+-keep class tv.danmaku.ijk.** { *; }
+-dontwarn tv.danmaku.ijk.**
\ No newline at end of file
diff --git a/videoCache/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties b/videoCache/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
index 63e8a6c..6692149 100644
--- a/videoCache/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
+++ b/videoCache/build/intermediates/incremental/mergeDebugAndroidTestResources/compile-file-map.properties
@@ -1 +1 @@
-#Fri Dec 02 23:33:54 GMT+08:00 2016
+#Sat Dec 03 14:06:59 GMT+08:00 2016
diff --git a/videoCache/build/intermediates/incremental/packageDebugResources/compile-file-map.properties b/videoCache/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
index 41e40de..9017538 100644
--- a/videoCache/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
+++ b/videoCache/build/intermediates/incremental/packageDebugResources/compile-file-map.properties
@@ -1 +1 @@
-#Fri Dec 02 23:33:52 GMT+08:00 2016
+#Sat Dec 03 14:06:58 GMT+08:00 2016
diff --git a/videoCache/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties b/videoCache/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
index 4375b4c..1e1bd54 100644
--- a/videoCache/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
+++ b/videoCache/build/intermediates/incremental/packageReleaseResources/compile-file-map.properties
@@ -1 +1 @@
-#Fri Dec 02 23:34:58 GMT+08:00 2016
+#Sat Dec 03 14:06:48 GMT+08:00 2016
diff --git a/videoCache/build/intermediates/res/resources-debug-androidTest.ap_ b/videoCache/build/intermediates/res/resources-debug-androidTest.ap_
index 98690cbb63ee5840ae1f0f3e9e4bcaf64f8f93d1..e55bbe9a0cce59e5f806192ea888b45126b25da2 100644
GIT binary patch
delta 30
kcmeyv`iGS_z?+#xgn@~HgW*9z^G4n!Ow2%f@)jl!0EWH^ZU6uP

delta 30
kcmeyv`iGS_z?+#xgn@~HgTZ=F(?;GUOw2%f@)jl!0Df)=x&QzG

-- 
GitLab