From a84d46f36586752e28efebe36d9b1b559da59753 Mon Sep 17 00:00:00 2001 From: okjack Date: Sat, 1 Jun 2024 19:49:30 +0800 Subject: [PATCH] Update gradle --- app/build.gradle | 6 +++++- app/proguard-rules.pro | 12 +++++++++++- build.gradle | 10 +++++----- catvod/build.gradle | 2 ++ forcetech/build.gradle | 2 ++ gradle.properties | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 2 +- hook/build.gradle | 2 ++ ijkplayer/build.gradle | 2 ++ jianpian/build.gradle | 2 ++ pyramid/build.gradle | 2 ++ quickjs/build.gradle | 2 ++ thunder/build.gradle | 2 ++ thunder/src/main/AndroidManifest.xml | 1 + tvbus/build.gradle | 2 ++ youtube/build.gradle | 2 ++ 16 files changed, 47 insertions(+), 12 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e6e909126..ad9bfce0d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,12 +3,15 @@ plugins { } android { + namespace 'com.fongmi.android.tv' + compileSdk 34 flavorDimensions = ["mode", "api", "abi"] defaultConfig { applicationId "com.fongmi.android.tv" minSdk 21 + //noinspection ExpiredTargetSdkVersion targetSdk 28 versionCode 235 versionName "0601" @@ -47,6 +50,7 @@ android { } buildFeatures { + buildConfig true viewBinding true } @@ -115,7 +119,6 @@ dependencies { implementation project(':media-lib-ui') implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'androidx.biometric:biometric:1.1.0' - implementation 'androidx.lifecycle:lifecycle-viewmodel:2.7.0' implementation 'androidx.room:room-runtime:2.6.1' implementation 'androidx.media:media:1.7.0' implementation 'cat.ereza:customactivityoncrash:2.4.0' @@ -134,6 +137,7 @@ dependencies { implementation 'com.hierynomus:smbj:0.13.0' implementation 'com.tencent.tbs:tbssdk:44286' implementation 'com.github.YarikSOffice:lingver:1.3.0' + implementation 'javax.servlet:javax.servlet-api:3.1.0' implementation 'org.chromium.net:cronet-embedded:76.3809.111' implementation 'org.eclipse.jetty:jetty-client:8.1.21.v20160908' implementation 'org.eclipse.jetty:jetty-server:8.1.21.v20160908' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index df6ca28be..52592a5e8 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -34,13 +34,23 @@ # Cling -keep class org.fourthline.cling.** { *; } -keep class javax.xml.** { *; } +-dontwarn org.ietf.jgss.** +-dontwarn com.sun.net.** +-dontwarn sun.net.** +-dontwarn java.awt.** +-dontwarn javax.** # Cronet -keep class org.chromium.net.** { *; } -keep class com.google.net.cronet.** { *; } # EXO --keep class org.xmlpull.v1.** { *; } +-dontwarn org.xmlpull.v1.** +-dontwarn org.kxml2.io.** +-dontwarn android.content.res.** +-dontwarn org.slf4j.impl.StaticLoggerBinder +-keep class org.xmlpull.** { *; } +-keepclassmembers class org.xmlpull.** { *; } -keep class androidx.media3.** { *; } # IJK diff --git a/build.gradle b/build.gradle index a70c26ddb..793442f38 100644 --- a/build.gradle +++ b/build.gradle @@ -1,16 +1,16 @@ plugins { - id 'org.jetbrains.kotlin.android' version '1.8.20' apply false - id 'com.android.application' version '7.2.2' apply false - id 'com.android.library' version '7.2.2' apply false + id 'org.jetbrains.kotlin.android' version '1.9.0' apply false + id 'com.android.application' version '8.0.1' apply false + id 'com.android.library' version '8.0.1' apply false id 'com.chaquo.python' version '14.0.2' apply false } tasks.register('clean', Delete) { - delete rootProject.buildDir + delete rootProject.layout.buildDirectory } project.ext { - gsonVersion = '2.10.1' + gsonVersion = '2.11.0' jsoupVersion = '1.15.3' okhttpVersion = '4.12.0' annotationVersion = '1.3.0' diff --git a/catvod/build.gradle b/catvod/build.gradle index 42dbf91b3..dd9cc64d9 100644 --- a/catvod/build.gradle +++ b/catvod/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'com.github.catvod.crawler' + compileSdk 34 defaultConfig { diff --git a/forcetech/build.gradle b/forcetech/build.gradle index 7f685900b..fbef9b928 100644 --- a/forcetech/build.gradle +++ b/forcetech/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'com.forcetech' + compileSdk 34 defaultConfig { diff --git a/gradle.properties b/gradle.properties index 3129f3f7a..49ee7fd76 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,13 +6,11 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.daemon=true -org.gradle.parallel=true org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8 # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true +org.gradle.parallel=true # AndroidX package structure to make it clearer which packages are bundled with the # Android operating system, and which are packaged with your app"s APK # https://developer.android.com/topic/libraries/support-library/androidx-rn @@ -21,4 +19,6 @@ android.enableJetifier=true # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.useFullClasspathForDexingTransform=true +android.nonTransitiveRClass=true +android.nonFinalResIds=false \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index cbb33c1d4..f99022d23 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Mar 29 12:54:35 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/hook/build.gradle b/hook/build.gradle index 1848250c1..14e3ccbac 100644 --- a/hook/build.gradle +++ b/hook/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'com.fongmi.hook' + compileSdk 34 defaultConfig { diff --git a/ijkplayer/build.gradle b/ijkplayer/build.gradle index 2d5929478..9124b4210 100644 --- a/ijkplayer/build.gradle +++ b/ijkplayer/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'tv.danmaku.ijk.media.player' + compileSdk 34 defaultConfig { diff --git a/jianpian/build.gradle b/jianpian/build.gradle index b9833212c..9dd61fd8f 100644 --- a/jianpian/build.gradle +++ b/jianpian/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'com.p2p' + compileSdk 34 defaultConfig { diff --git a/pyramid/build.gradle b/pyramid/build.gradle index dc864170a..117e6156d 100644 --- a/pyramid/build.gradle +++ b/pyramid/build.gradle @@ -4,6 +4,8 @@ plugins { } android { + namespace 'com.undcover.freedom.pyramid' + compileSdk 34 flavorDimensions = ["abi"] diff --git a/quickjs/build.gradle b/quickjs/build.gradle index 1097e0aa5..dd3a95737 100644 --- a/quickjs/build.gradle +++ b/quickjs/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'com.fongmi.android.tv.quickjs' + compileSdk 34 defaultConfig { diff --git a/thunder/build.gradle b/thunder/build.gradle index b9833212c..034004d3a 100644 --- a/thunder/build.gradle +++ b/thunder/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'com.ghost.thunder' + compileSdk 34 defaultConfig { diff --git a/thunder/src/main/AndroidManifest.xml b/thunder/src/main/AndroidManifest.xml index 658513ac3..f5a5cae6c 100644 --- a/thunder/src/main/AndroidManifest.xml +++ b/thunder/src/main/AndroidManifest.xml @@ -1 +1,2 @@ + diff --git a/tvbus/build.gradle b/tvbus/build.gradle index 7f685900b..1d86f69da 100644 --- a/tvbus/build.gradle +++ b/tvbus/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'com.tvbus.engine' + compileSdk 34 defaultConfig { diff --git a/youtube/build.gradle b/youtube/build.gradle index 1cc4b7c29..7a45fccbe 100644 --- a/youtube/build.gradle +++ b/youtube/build.gradle @@ -3,6 +3,8 @@ plugins { } android { + namespace 'com.github.kiulian.downloader' + compileSdk 34 defaultConfig {