diff --git a/app/build.gradle b/app/build.gradle index 6f48dc0c2..f9d5248a5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { minSdk 21 //noinspection ExpiredTargetSdkVersion targetSdk 28 - versionCode 302 - versionName "3.0.2" + versionCode 303 + versionName "3.0.3" javaCompileOptions { annotationProcessorOptions { arguments = ["room.schemaLocation": "$projectDir/schemas".toString(), "eventBusIndex": "com.fongmi.android.tv.event.EventIndex"] @@ -81,7 +81,6 @@ android { } compileOptions { - coreLibraryDesugaringEnabled true sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } @@ -127,5 +126,4 @@ dependencies { annotationProcessor 'androidx.room:room-compiler:2.6.1' annotationProcessor 'com.github.bumptech.glide:compiler:4.16.0' annotationProcessor 'org.greenrobot:eventbus-annotation-processor:3.3.1' - coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.4' } \ No newline at end of file diff --git a/catvod/build.gradle b/catvod/build.gradle index 09e6ef8b3..b791ebc75 100644 --- a/catvod/build.gradle +++ b/catvod/build.gradle @@ -27,7 +27,6 @@ dependencies { api 'com.squareup.okhttp3:okhttp:' + okhttpVersion api 'com.squareup.okhttp3:okhttp-dnsoverhttps:' + okhttpVersion api 'com.squareup.okhttp3:logging-interceptor:' + okhttpVersion - api 'org.conscrypt:conscrypt-android:2.5.2' api('com.google.guava:guava:33.0.0-android') { exclude group: 'com.google.code.findbugs', module: 'jsr305' exclude group: 'org.checkerframework', module: 'checker-compat-qual' diff --git a/catvod/src/main/java/com/github/catvod/net/OkHttp.java b/catvod/src/main/java/com/github/catvod/net/OkHttp.java index 1086dac4a..07c9a61e6 100644 --- a/catvod/src/main/java/com/github/catvod/net/OkHttp.java +++ b/catvod/src/main/java/com/github/catvod/net/OkHttp.java @@ -10,11 +10,8 @@ import com.github.catvod.net.interceptor.RequestInterceptor; import com.github.catvod.net.interceptor.ResponseInterceptor; import com.github.catvod.utils.Path; -import org.conscrypt.Conscrypt; - import java.net.ProxySelector; import java.security.SecureRandom; -import java.security.Security; import java.security.cert.X509Certificate; import java.util.Map; import java.util.Objects; @@ -49,7 +46,6 @@ public class OkHttp { static { defaultSelector = ProxySelector.getDefault(); - Security.insertProviderAt(Conscrypt.newProvider(), 1); } private static class Loader {