混淆问题修复

Kyson · Mar 24, 2020 · f28c555 · f28c555
1 parent d1097a6
commit f28c555
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/android-godeye-sample/proguard-rules.pro b/android-godeye-sample/proguard-rules.pro
@@ -19,11 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
-#-dontwarn leakcanary.**
--dontwarn okio.**
--dontwarn com.squareup.okhttp3.**
--keep class com.squareup.okhttp3.** { *; }
--keep interface com.squareup.okhttp3.** { *; }
 -dontwarn javax.annotation.**
 -dontwarn org.codehaus.**
 -dontwarn org.conscrypt.**

diff --git a/android-godeye-toolboxes/android-godeye-leakcanary/consumer-rules.pro b/android-godeye-toolboxes/android-godeye-leakcanary/consumer-rules.pro
@@ -0,0 +1,2 @@
+-dontwarn leakcanary.**
+-keep class leakcanary.**
diff --git a/android-godeye-toolboxes/android-godeye-leakcanary/proguard-rules.pro b/android-godeye-toolboxes/android-godeye-leakcanary/proguard-rules.pro
@@ -19,4 +19,3 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--dontwarn leakcanary.**
diff --git a/android-godeye-toolboxes/android-godeye-okhttp/consumer-rules.pro b/android-godeye-toolboxes/android-godeye-okhttp/consumer-rules.pro
@@ -0,0 +1,4 @@
+-dontwarn okio.**
+-dontwarn com.squareup.okhttp3.**
+-keep class com.squareup.okhttp3.** { *; }
+-keep interface com.squareup.okhttp3.** { *; }
diff --git a/android-godeye/build.gradle b/android-godeye/build.gradle
@@ -13,6 +13,7 @@ android {
         versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles 'consumer-rules.pro'
     }
     compileOptions {
         targetCompatibility = "8"

diff --git a/android-godeye/consumer-rules.pro b/android-godeye/consumer-rules.pro
@@ -0,0 +1,3 @@
+-dontwarn leakcanary.**
+-dontwarn okio.**
+-keep class leakcanary.**
diff --git a/android-godeye/proguard-rules.pro b/android-godeye/proguard-rules.pro
@@ -19,4 +19,4 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--dontwarn leakcanary.**
+
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-dontwarn leakcanary.**
		-keep class leakcanary.**