From a499c8b5fa04fbe0d0f8d0ae1a0af95e4bdbf2a9 Mon Sep 17 00:00:00 2001 From: FongMi Date: Thu, 11 Jan 2024 00:14:31 +0800 Subject: [PATCH] Fix build --- app/build.gradle | 11 ++++++++++- catvod/build.gradle | 6 ++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/build.gradle b/app/build.gradle index 03c4385bf..fe0efd5d6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,6 +73,15 @@ android { } } + configurations.configureEach { + resolutionStrategy { + force 'org.seamless:seamless-http:1.1.1' + force 'org.seamless:seamless-swing:1.1.1' + force 'org.seamless:seamless-util:1.1.1' + force 'org.seamless:seamless-xml:1.1.1' + } + } + lint { disable 'UnsafeOptInUsageError' } @@ -116,7 +125,7 @@ dependencies { implementation 'com.github.bumptech.glide:okhttp3-integration:4.16.0' implementation 'com.github.jahirfiquitiva:TextDrawable:1.0.3' implementation('com.github.TeamNewPipe:NewPipeExtractor:v0.23.1') { exclude group: 'org.jsoup', module: 'jsoup' } - implementation('com.github.thegrizzlylabs:sardine-android:0.8') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' } + implementation 'com.github.thegrizzlylabs:sardine-android:0.8' implementation 'com.google.android.material:material:1.11.0' implementation 'com.google.net.cronet:cronet-okhttp:0.1.0' implementation 'com.google.zxing:core:3.3.0' diff --git a/catvod/build.gradle b/catvod/build.gradle index 8d26bb222..636e5697d 100644 --- a/catvod/build.gradle +++ b/catvod/build.gradle @@ -9,6 +9,12 @@ android { minSdk 21 targetSdk 28 } + + configurations.configureEach { + resolutionStrategy { + force 'com.squareup.okhttp3:okhttp:' + okhttpVersion + } + } } dependencies {