From 45a5ae99f3a3e6b4b5a34a62e96827b49ab9698d Mon Sep 17 00:00:00 2001 From: FongMi Date: Sun, 24 Sep 2023 22:38:13 +0800 Subject: [PATCH] Update gradle --- app/build.gradle | 6 +++--- catvod/build.gradle | 8 ++++---- danmaku/build.gradle | 2 +- forcetech/build.gradle | 2 +- hook/build.gradle | 3 +-- hook/src/main/AndroidManifest.xml | 2 +- ijkplayer/build.gradle | 2 +- jianpian/build.gradle | 2 +- pyramid/build.gradle | 2 +- quickjs/build.gradle | 2 +- thunder/build.gradle | 10 ++++++---- tvbus/build.gradle | 2 +- zlive/build.gradle | 2 +- 13 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1675b2748..e3e85a65e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 flavorDimensions = ["mode", "api", "abi"] defaultConfig { @@ -106,7 +106,7 @@ dependencies { implementation platform('org.jetbrains.kotlin:kotlin-bom:1.8.20') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.biometric:biometric:1.1.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.1' + implementation 'androidx.lifecycle:lifecycle-viewmodel:2.6.2' implementation 'androidx.room:room-runtime:2.5.2' implementation 'androidx.media:media:1.6.0' implementation 'cat.ereza:customactivityoncrash:2.4.0' @@ -121,7 +121,7 @@ dependencies { implementation 'org.greenrobot:eventbus:3.3.1' implementation 'org.nanohttpd:nanohttpd:2.3.1' implementation('org.simpleframework:simple-xml:2.7.1') { exclude group: 'stax', module: 'stax-api' exclude group: 'xpp3', module: 'xpp3' } - leanbackImplementation 'androidx.leanback:leanback:1.2.0-alpha02' + leanbackImplementation 'androidx.leanback:leanback:1.2.0-alpha03' leanbackImplementation 'me.jessyan:autosize:1.2.1' mobileImplementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' mobileImplementation 'com.github.chrisbanes:PhotoView:2.3.0' diff --git a/catvod/build.gradle b/catvod/build.gradle index abfdeb39f..af933816a 100644 --- a/catvod/build.gradle +++ b/catvod/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 @@ -15,13 +15,13 @@ dependencies { api project(':media-lib-common') api 'androidx.annotation:annotation:' + annotationVersion api 'androidx.preference:preference:1.2.1' + api('com.github.thegrizzlylabs:sardine-android:0.8') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' } api 'com.google.code.gson:gson:' + gsonVersion api 'com.google.net.cronet:cronet-okhttp:0.1.0' - api 'com.squareup.okhttp3:okhttp:' + okhttpVersion - api 'com.squareup.okhttp3:okhttp-dnsoverhttps:' + okhttpVersion - api('com.github.thegrizzlylabs:sardine-android:0.8') { exclude group: 'com.squareup.okhttp3', module: 'okhttp' } api 'com.hierynomus:smbj:0.11.5' api 'com.orhanobut:logger:2.2.0' + api 'com.squareup.okhttp3:okhttp:' + okhttpVersion + api 'com.squareup.okhttp3:okhttp-dnsoverhttps:' + okhttpVersion api 'org.chromium.net:cronet-embedded:101.4951.41' api 'org.jsoup:jsoup:' + jsoupVersion } \ No newline at end of file diff --git a/danmaku/build.gradle b/danmaku/build.gradle index 2855095ee..b9833212c 100644 --- a/danmaku/build.gradle +++ b/danmaku/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 diff --git a/forcetech/build.gradle b/forcetech/build.gradle index a3fd7cbb8..bb423db82 100644 --- a/forcetech/build.gradle +++ b/forcetech/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 diff --git a/hook/build.gradle b/hook/build.gradle index 7ba6b50f3..1848250c1 100644 --- a/hook/build.gradle +++ b/hook/build.gradle @@ -3,8 +3,7 @@ plugins { } android { - namespace 'com.fongmi.hook' - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 diff --git a/hook/src/main/AndroidManifest.xml b/hook/src/main/AndroidManifest.xml index 568741e54..ede65125e 100644 --- a/hook/src/main/AndroidManifest.xml +++ b/hook/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/ijkplayer/build.gradle b/ijkplayer/build.gradle index 601ad14d4..309e50018 100644 --- a/ijkplayer/build.gradle +++ b/ijkplayer/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 diff --git a/jianpian/build.gradle b/jianpian/build.gradle index cfbf5df6b..e6ad60ee0 100644 --- a/jianpian/build.gradle +++ b/jianpian/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 flavorDimensions = ["abi"] defaultConfig { diff --git a/pyramid/build.gradle b/pyramid/build.gradle index 3e7a64606..e92dcc237 100644 --- a/pyramid/build.gradle +++ b/pyramid/build.gradle @@ -4,7 +4,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 flavorDimensions = ["abi"] defaultConfig { diff --git a/quickjs/build.gradle b/quickjs/build.gradle index 277364d6c..f7043ccca 100644 --- a/quickjs/build.gradle +++ b/quickjs/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 diff --git a/thunder/build.gradle b/thunder/build.gradle index d82abb411..e6ad60ee0 100644 --- a/thunder/build.gradle +++ b/thunder/build.gradle @@ -1,12 +1,14 @@ -apply plugin: 'com.android.library' +plugins { + id 'com.android.library' +} android { - compileSdk 33 + compileSdk 34 flavorDimensions = ["abi"] defaultConfig { - minSdkVersion 21 - targetSdkVersion 28 + minSdk 21 + targetSdk 28 } productFlavors { diff --git a/tvbus/build.gradle b/tvbus/build.gradle index a3fd7cbb8..bb423db82 100644 --- a/tvbus/build.gradle +++ b/tvbus/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21 diff --git a/zlive/build.gradle b/zlive/build.gradle index ead77e4e7..f5d1dbc10 100644 --- a/zlive/build.gradle +++ b/zlive/build.gradle @@ -3,7 +3,7 @@ plugins { } android { - compileSdk 33 + compileSdk 34 defaultConfig { minSdk 21