fixed R8 error on slf4j

XilinJia · Apr 19, 2024 · 61c61f4 · 61c61f4
1 parent 2c28af7
commit 61c61f4
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -129,9 +129,9 @@ You can find the license text in the LICENSE file.
 
 ## Copyright
 
-New files and modifications in the project is copyrighted in 2024 by Xilin Jia and related contributors.
+New files and contents in the project are copyrighted in 2024 by Xilin Jia and related contributors.
 
-Original contents from the forked project maintains copyrights of the AntennaPod team.
+Original contents from the forked project maintain copyrights of the AntennaPod team.
 
 ## Licenses and permissions
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -36,10 +36,19 @@ android {
 
     packagingOptions {
         resources {
-            excludes += ["META-INF/LICENSE.txt",
-                         "META-INF/NOTICE.txt",
-                         "META-INF/CHANGES",
-                         "META-INF/README.md"]
+            exclude 'META-INF/DEPENDENCIES'
+            exclude 'META-INF/LICENSE'
+            exclude 'META-INF/NOTICE'
+            exclude 'META-INF/CHANGES'
+            exclude 'META-INF/README.md'
+            exclude 'META-INF/NOTICE.txt'
+            exclude 'META-INF/LICENSE.txt'
+            exclude 'META-INF/MANIFEST.MF'
+
+//            excludes += ["META-INF/LICENSE.txt",
+//                         "META-INF/NOTICE.txt",
+//                         "META-INF/CHANGES",
+//                         "META-INF/README.md"]
         }
     }
 

diff --git a/app/proguard.cfg b/app/proguard.cfg
@@ -61,3 +61,5 @@
 -dontwarn java.lang.management.ManagementFactory
 -dontwarn java.lang.management.ThreadInfo
 -dontwarn java.lang.management.ThreadMXBean
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder