diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 6a8c2f8b..46b227a5 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -47,19 +47,8 @@ # Please add these rules to your existing keep rules in order to suppress warnings. # This is generated automatically by the Android Gradle plugin. --dontwarn io.netty.internal.tcnative.AsyncSSLPrivateKeyMethod --dontwarn io.netty.internal.tcnative.AsyncTask --dontwarn io.netty.internal.tcnative.Buffer --dontwarn io.netty.internal.tcnative.CertificateCallback --dontwarn io.netty.internal.tcnative.CertificateCompressionAlgo --dontwarn io.netty.internal.tcnative.CertificateVerifier --dontwarn io.netty.internal.tcnative.Library --dontwarn io.netty.internal.tcnative.SSL --dontwarn io.netty.internal.tcnative.SSLContext --dontwarn io.netty.internal.tcnative.SSLPrivateKeyMethod --dontwarn io.netty.internal.tcnative.SSLSessionCache --dontwarn io.netty.internal.tcnative.SessionTicketKey --dontwarn io.netty.internal.tcnative.SniHostNameMatcher +# Ignore warnings from Netty +-dontwarn io.netty.** -dontwarn java.lang.management.ManagementFactory -dontwarn java.lang.management.RuntimeMXBean -dontwarn org.apache.log4j.Level @@ -79,5 +68,18 @@ -dontwarn org.eclipse.jetty.npn.NextProtoNego$ServerProvider -dontwarn org.eclipse.jetty.npn.NextProtoNego -dontwarn reactor.blockhound.integration.BlockHoundIntegration --dontwarn org.slf4j** --dontwarn org.slf4j.** \ No newline at end of file +# Ktor Server + +-keep class io.ktor.server.netty.EngineMain { *; } +-keep class io.ktor.server.config.HoconConfigLoader { *; } + +# Logback (Custom rules, see https://github.com/krschultz/android-proguard-snippets/blob/master/libraries/proguard-logback-android.pro) +# to ignore warnings coming from slf4j and logback + +-keep class ch.qos.** { *; } +-dontwarn ch.qos.** + +-keep class org.slf4j.** { *; } +-dontwarn org.slf4j.** + +-dontwarn ch.qos.logback.core.net.* \ No newline at end of file diff --git a/jar/custom_spider.jar b/jar/custom_spider.jar index ca281ce8..69180c1c 100644 Binary files a/jar/custom_spider.jar and b/jar/custom_spider.jar differ diff --git a/jar/custom_spider.jar.md5 b/jar/custom_spider.jar.md5 index 676c334e..4a95e7f5 100644 --- a/jar/custom_spider.jar.md5 +++ b/jar/custom_spider.jar.md5 @@ -1 +1 @@ -dd6c6d1e9aa097c900a0769c1f181147 +e167f85157b04265cf7104d24fe9ba07 diff --git a/json/test.json b/json/test.json index 195d8cf8..db33c756 100644 --- a/json/test.json +++ b/json/test.json @@ -1,5 +1,5 @@ { - "spider": "https://ghproxy.net/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;dd6c6d1e9aa097c900a0769c1f181147", + "spider": "https://ghproxy.net/https://raw.githubusercontent.com/lushunming/AndroidCatVodSpider/multiThreadNew/jar/custom_spider.jar;md5;e167f85157b04265cf7104d24fe9ba07", "lives": [ { "name": "电视直播",