From 37c2826312cc0df4a1eaf616dd64bd0be7c1f8ae Mon Sep 17 00:00:00 2001 From: jhengazuki Date: Tue, 5 Aug 2025 13:39:59 +0800 Subject: [PATCH] Update gradle --- app/build.gradle | 18 ++-- build.gradle | 6 +- gradle/wrapper/gradle-wrapper.properties | 2 +- json/alist.json | 36 ++----- json/demo.json | 25 ----- json/market.json | 121 +---------------------- json/samba.json | 2 +- json/webdav.json | 14 +-- 8 files changed, 30 insertions(+), 194 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3aef7f53..31f7ee1d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -6,12 +6,14 @@ plugins { android { namespace 'com.github.catvod' - compileSdk 35 + compileSdk { + version = release(36) + } defaultConfig { applicationId "com.github.catvod.demo" minSdk 21 - targetSdk 35 + targetSdk 36 } buildTypes { @@ -28,8 +30,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } configurations.configureEach { @@ -42,10 +44,10 @@ android { dependencies { implementation 'com.squareup.okhttp3:okhttp:' + okhttpVersion implementation 'com.github.thegrizzlylabs:sardine-android:0.9' - implementation 'wang.harlon.quickjs:wrapper-android:3.2.0' - implementation 'com.google.code.gson:gson:2.11.0' - implementation 'cn.wanghaomiao:JsoupXpath:2.5.1' + implementation 'wang.harlon.quickjs:wrapper-android:3.2.3' + implementation 'com.google.code.gson:gson:2.13.1' + implementation 'cn.wanghaomiao:JsoupXpath:2.5.3' implementation 'com.hierynomus:smbj:0.14.0' implementation 'com.orhanobut:logger:2.2.0' - implementation 'org.jsoup:jsoup:1.19.1' + implementation 'org.jsoup:jsoup:1.21.1' } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 050b402c..d26f27f6 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { id 'ru.cleverpumpkin.proguard-dictionaries-generator' version '1.0.8' apply false - id 'com.android.application' version '8.8.1' apply false - id 'com.android.library' version '8.8.1' apply false + id 'com.android.application' version '8.12.0' apply false + id 'com.android.library' version '8.12.0' apply false } tasks.register('clean', Delete) { @@ -10,5 +10,5 @@ tasks.register('clean', Delete) { } project.ext { - okhttpVersion = '5.0.0-alpha.14' + okhttpVersion = '5.1.0' } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 16adbb70..24dacd79 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-8.10.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/json/alist.json b/json/alist.json index f2fc1bbc..8bbf6c73 100644 --- a/json/alist.json +++ b/json/alist.json @@ -1,41 +1,17 @@ [ { - "name": "小雅", - "server": "http://alist.xiaoya.pro" - }, - { - "name": "觸光", - "server": "https://pan.ichuguang.com" - }, - { - "name": "一只魚", - "server": "https://vtok.pp.ua/" - }, - { - "name": "七米藍", - "server": "https://al.chirmyram.com" - }, - { - "name": "神族九帝", - "server": "https://alist.shenzjd.com" - }, - { - "name": "梓澪", - "server": "https://zi0.cc" - }, - { - "name": "範本", - "server": "https://one.fongmi.com", + "name": "Tangsan", + "server": "http://192.168.0.1", "search": true, "hidden": false, "login": { - "username": "fongmi", - "password": "fongmi" + "username": "1234", + "password": "1234" }, "params": [ { - "path": "/安齋拉拉", - "pass": "18181818" + "path": "/test", + "pass": "1234" } ] } diff --git a/json/demo.json b/json/demo.json index 1e1565f3..85c0229a 100644 --- a/json/demo.json +++ b/json/demo.json @@ -1,6 +1,5 @@ { "spider": "./jar/custom_spider.jar", - "wallpaper": "http://饭太硬.top/深色壁纸/api.php", "lives": [ { "name": "XtreamCode", @@ -90,31 +89,7 @@ ] } ], - "proxy": [ - "raw.githubusercontent.com", - "googlevideo.com", - "googleapis.com", - "youtube.com" - ], "rules": [ - { - "name": "火山嗅探", - "hosts": [ - "huoshan.com" - ], - "regex": [ - "item_id=" - ] - }, - { - "name": "抖音嗅探", - "hosts": [ - "douyin.com" - ], - "regex": [ - "is_play_url=" - ] - }, { "name": "農民嗅探", "hosts": [ diff --git a/json/market.json b/json/market.json index a32e9cdc..e165b049 100644 --- a/json/market.json +++ b/json/market.json @@ -1,126 +1,15 @@ [ { - "name": "推薦", + "name": "APP", "list": [ { - "url": "https://i.imgs.ovh/2023/10/19/2mfxN.jpeg", - "icon": "https://i.imgs.ovh/2023/10/19/2mfxN.jpeg" - } - ] - }, - { - "name": "正式版", - "list": [ - { - "name": "電視-java", - "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-java-armeabi_v7a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", + "name": "電視版", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-armeabi_v7a.apk", "version": "v7a" }, { - "name": "電視-java", - "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-java-arm64_v8a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", - "version": "v8a" - }, - { - "name": "電視-py", - "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-python-armeabi_v7a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", - "version": "v7a" - }, - { - "name": "電視-py", - "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/leanback-python-arm64_v8a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", - "version": "v8a" - }, - { - "name": "手機-java", - "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-java-armeabi_v7a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", - "version": "v7a" - }, - { - "name": "手機-java", - "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-java-arm64_v8a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", - "version": "v8a" - }, - { - "name": "手機-py", - "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-python-armeabi_v7a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", - "version": "v7a" - }, - { - "name": "手機-py", - "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-python-arm64_v8a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", - "version": "v8a" - } - ] - }, - { - "name": "內測版", - "list": [ - { - "name": "電視-java", - "url": "https://fm.caioa.link/main/apk/dev/leanback-java-armeabi_v7a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", - "version": "v7a" - }, - { - "name": "電視-java", - "url": "https://fm.caioa.link/main/apk/dev/leanback-java-arm64_v8a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", - "version": "v8a" - }, - { - "name": "電視-py", - "url": "https://fm.caioa.link/main/apk/dev/leanback-python-armeabi_v7a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", - "version": "v7a" - }, - { - "name": "電視-py", - "url": "https://fm.caioa.link/main/apk/dev/leanback-python-arm64_v8a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", - "version": "v8a" - }, - { - "name": "手機-java", - "url": "https://fm.caioa.link/main/apk/dev/mobile-java-armeabi_v7a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", - "version": "v7a" - }, - { - "name": "手機-java", - "url": "https://fm.caioa.link/main/apk/dev/mobile-java-arm64_v8a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", - "version": "v8a" - }, - { - "name": "手機-py", - "url": "https://fm.caioa.link/main/apk/dev/mobile-python-armeabi_v7a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", - "version": "v7a" - }, - { - "name": "手機-py", - "url": "https://fm.caioa.link/main/apk/dev/mobile-python-arm64_v8a.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8lVK.png", - "version": "v8a" - } - ] - }, - { - "name": "4.x版", - "list": [ - { - "name": "電視", - "url": "https://fm.caioa.link/main/apk/kitkat/leanback.apk", - "icon": "https://i.imgs.ovh/2023/10/17/r8nk2.png", + "name": "手機版", + "url": "https://github.com/FongMi/Release/raw/fongmi/apk/release/mobile-armeabi_v7a.apk", "version": "v7a" } ] diff --git a/json/samba.json b/json/samba.json index fdd89a20..14a4d15b 100644 --- a/json/samba.json +++ b/json/samba.json @@ -1,6 +1,6 @@ [ { "name": "Tangsan", - "server": "smb://192.168.0.2/Users" + "server": "smb://192.168.0.1/Users" } ] \ No newline at end of file diff --git a/json/webdav.json b/json/webdav.json index d4591293..78a8005d 100644 --- a/json/webdav.json +++ b/json/webdav.json @@ -1,14 +1,8 @@ [ { - "name": "七米藍", - "server": "https://al.chirmyram.com/dav", - "user": "alist", - "pass": "alist" - }, - { - "name": "影視庫", - "server": "https://esir.eu.org/dav", - "user": "alist", - "pass": "alist" + "name": "Tangsan", + "server": "http://192.168.0.1/dav", + "user": "1234", + "pass": "1234" } ] \ No newline at end of file