From 61c61f4df12b2cc709fb66466b32952e0b6b8028 Mon Sep 17 00:00:00 2001 From: Xilin Jia <6257601+XilinJia@users.noreply.github.com> Date: Fri, 19 Apr 2024 11:52:23 +0100 Subject: [PATCH] fixed R8 error on slf4j --- README.md | 4 ++-- app/build.gradle | 17 +++++++++++++---- app/proguard.cfg | 2 ++ 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 34af3ee2..f1205c2a 100644 --- 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 index 4e10a202..4594cfb6 100644 --- 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 index 6ab5e4a2..864ffab1 100644 --- 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