From 8843f46af905d25f5debb2184dd4ceaaddf71ae6 Mon Sep 17 00:00:00 2001 From: sisterfuture Date: Tue, 31 Mar 2026 18:08:13 +0800 Subject: [PATCH 1/4] Bump builtinftp to 2026.3.31 + add explicit ftpserver 2026.3.39 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - builtinftp: 2026.3.29 → 2026.3.31 - NEW: Explicit ftpserver: 2026.3.39 dependency (for LIST command fix) - Includes endsWith("/") check for proper directory listing - Can be removed after builtinftp depends on ftpserver 2026.3.39+ --- app/build.gradle | 172 ++--------------------------------------------- 1 file changed, 7 insertions(+), 165 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3048f38a..20c97835 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,169 +1,11 @@ -apply plugin: 'com.android.application' -apply plugin: 'io.objectbox' // 这个插件必须加！ -// ✅ 未来姐姐的测试注释：这是一个小修改 - -dependencies -{ - implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.jakewharton:butterknife:10.2.3' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' // ✄ 注意是 -compiler - implementation 'com.google.code.gson:gson:2.8.2' - implementation 'org.apache.commons:commons-lang3:3.4' - implementation 'org.apache.commons:commons-io:1.3.2' - implementation 'com.github.hxcan:CodePosition:2023.5.19' - implementation 'com.mcxiaoke.volley:library:1.0.19' - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation group: 'com.squareup.okhttp', name: 'okhttp', version: '1.6.0' - implementation group: 'com.koushikdutta.async', name: 'androidasync', version: '2.1.7' - implementation 'androidx.multidex:multidex:2.0.1' - implementation 'io.noties.markwon:core:4.6.1' - implementation 'com.jcraft:jsch:0.1.55' - implementation 'io.noties.markwon:ext-strikethrough:4.6.1' - implementation 'io.noties.markwon:ext-tables:4.6.1' - implementation 'com.belerweb:pinyin4j:2.5.1' - implementation 'androidx.annotation:annotation:1.5.0' - implementation 'androidx.appcompat:appcompat:1.6.1' // Or the latest version - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'org.tensorflow:tensorflow-lite:1.12.0' - implementation 'org.tensorflow:tensorflow-lite-select-tf-ops:2.16.1' - implementation 'org.tensorflow:tensorflow-lite-support:0.4.4' - implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' // Or the latest version - implementation 'org.jetbrains:annotations:23.0.0' // Or the latest version - implementation 'androidx.recyclerview:recyclerview:1.3.0' // 或者使用最新的版本 - implementation 'com.github.hxcan:victoriafresh.android:2026.3.8' - implementation 'com.upokecenter:cbor:4.4.4' - // 在 dependencies 里加上 ObjectBox - implementation 'io.objectbox:objectbox-android:5.1.0' - // 添加注解处理器 - annotationProcessor 'io.objectbox:objectbox-processor:5.1.0' - implementation 'commons-net:commons-net:3.8.0' - - // #3088 百度地图 SDK 依赖（降级到 7.5.4，与旅行盲盒一致） - // 地图组件 - implementation 'com.baidu.lbsyun:BaiduMapSDK_Map:7.5.4' - // 检索组件（含反向地理编码） - implementation 'com.baidu.lbsyun:BaiduMapSDK_Search:7.5.4' - // 定位工具组件 - implementation 'com.baidu.lbsyun:BaiduMapSDK_Util:7.5.4' - // 全量定位组件 - implementation 'com.baidu.lbsyun:BaiduMapSDK_Location_All:9.3.7' - // #4834 添加 Timber 日志库（用于日志输出到外置存储） implementation 'com.jakewharton.timber:timber:5.0.1' // Builtin FTP Server - 最新版（用于数据备份） - // 注意：不需要显式添加 ftpserver 依赖，builtinftp 会通过传递依赖自动引入正确版本 - implementation 'com.github.hxcan:builtinftp:2026.3.29' -} - -android -{ - lint - { - baseline = file("lint-baseline.xml") - } - - buildFeatures - { - buildConfig = true - } - - compileSdkVersion 33 - buildToolsVersion '28.0.3' - namespace 'com.stupidbeauty.sisterfuture' - - signingConfigs { - debug { - storeFile file('../keystore.31/debug.keystore') - storePassword 'android' - keyAlias 'androiddebugkey' - keyPassword 'android' - } - } - - buildTypes - { - release - { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - debug - { - signingConfig signingConfigs.debug - } - } - - defaultConfig - { - applicationId "com.stupidbeauty.sisterfuture" - minSdkVersion 24 // 提升最低 API 级别以支持 ConcurrentHashMap.newKeySet() (API 24+) - targetSdkVersion 28 - versionCode 1091 - versionName "2026.3.26" - multiDexEnabled true - - // 配置支持的 SO 库架构 - 仅保留手机端需要的架构 - ndk - { - abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" - } - } - - sourceSets - { - main - { - jniLibs.srcDirs = ['libs'] - } - } - - aaptOptions { - noCompress "tflite" - } - - // #4800 抑制 D8 警告 - 针对第三方库的 stack map 表警告 - dexOptions { - additionalParameters = [ - '--no-warnings' - ] - } -} - -// # https://stackoverflow.com/questions/65380359/lomboks-access-to-jdk-compilers-internal-packages-incompatible-with-java-16 - -// # enable internal JDK API access at runtime -tasks.withType(JavaCompile).configureEach { - options.fork = true - options.forkOptions.jvmArgs += [ -// # essential for butterknife - '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED', - -// # if you need Glide or LomBok -// # these may not be the exact list, but it works for me - '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED', - ] -} -// 自定义 APK 输出文件名，包含版本信息 -android.applicationVariants.all { variant -> - variant.outputs.all { output -> - def versionName = variant.versionName - def versionCode = variant.versionCode - def buildTime = new Date().format('yyyyMMdd-HHmmss', TimeZone.getTimeZone('Asia/Shanghai')) - def buildType = variant.buildType.name - - if (buildType == 'debug') { - outputFileName = "sisterfuture-debug-v${versionName}-${versionCode}-${buildTime}.apk" - } else { - outputFileName = "sisterfuture-release-v${versionName}-${versionCode}-${buildTime}.apk" - } - } -} + implementation 'com.github.hxcan:builtinftp:2026.3.31' + + // 🔍 FIX: Explicitly add ftpserver 2026.3.39 to override transitive dependency + // This includes the LIST command fix (endsWith("/") check) + // Remove this line after builtinftp is updated to depend on ftpserver 2026.3.39+ + implementation 'com.github.hxcan:ftpserver:2026.3.39' +} \ No newline at end of file From e62a39b93cbbe5ecdb4a855aa8dcee91725b089b Mon Sep 17 00:00:00 2001 From: sisterfuture Date: Tue, 31 Mar 2026 18:09:34 +0800 Subject: [PATCH 2/4] Fix: Restore complete app/build.gradle with builtinftp/ftpserver upgrade MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Previous commit accidentally replaced entire file with only a snippet. This restores the FULL build.gradle file (6KB+) with: 1. builtinftp: 2026.3.29 → 2026.3.31 2. NEW: Explicit ftpserver: 2026.3.39 dependency (for LIST command fix) The explicit ftpserver dependency ensures the LIST command fix is available immediately, even before builtinftp is updated to depend on ftpserver 2026.3.39+. All other dependencies, plugins, configurations preserved exactly as in master. --- app/build.gradle | 162 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 20c97835..5dd6d6c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,3 +1,53 @@ +apply plugin: 'com.android.application' +apply plugin: 'io.objectbox' // 这个插件必须加！ +// ✅ 未来姐姐的测试注释：这是一个小修改 + +dependencies +{ + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.jakewharton:butterknife:10.2.3' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' // ✄ 注意是 -compiler + implementation 'com.google.code.gson:gson:2.8.2' + implementation 'org.apache.commons:commons-lang3:3.4' + implementation 'org.apache.commons:commons-io:1.3.2' + implementation 'com.github.hxcan:CodePosition:2023.5.19' + implementation 'com.mcxiaoke.volley:library:1.0.19' + implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation group: 'com.squareup.okhttp', name: 'okhttp', version: '1.6.0' + implementation group: 'com.koushikdutta.async', name: 'androidasync', version: '2.1.7' + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'io.noties.markwon:core:4.6.1' + implementation 'com.jcraft:jsch:0.1.55' + implementation 'io.noties.markwon:ext-strikethrough:4.6.1' + implementation 'io.noties.markwon:ext-tables:4.6.1' + implementation 'com.belerweb:pinyin4j:2.5.1' + implementation 'androidx.annotation:annotation:1.5.0' + implementation 'androidx.appcompat:appcompat:1.6.1' // Or the latest version + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'org.tensorflow:tensorflow-lite:1.12.0' + implementation 'org.tensorflow:tensorflow-lite-select-tf-ops:2.16.1' + implementation 'org.tensorflow:tensorflow-lite-support:0.4.4' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' // Or the latest version + implementation 'org.jetbrains:annotations:23.0.0' // Or the latest version + implementation 'androidx.recyclerview:recyclerview:1.3.0' // 或者使用最新的版本 + implementation 'com.github.hxcan:victoriafresh.android:2026.3.8' + implementation 'com.upokecenter:cbor:4.4.4' + // 在 dependencies 里加上 ObjectBox + implementation 'io.objectbox:objectbox-android:5.1.0' + // 添加注解处理器 + annotationProcessor 'io.objectbox:objectbox-processor:5.1.0' + implementation 'commons-net:commons-net:3.8.0' + + // #3088 百度地图 SDK 依赖（降级到 7.5.4，与旅行盲盒一致） + // 地图组件 + implementation 'com.baidu.lbsyun:BaiduMapSDK_Map:7.5.4' + // 检索组件（含反向地理编码） + implementation 'com.baidu.lbsyun:BaiduMapSDK_Search:7.5.4' + // 定位工具组件 + implementation 'com.baidu.lbsyun:BaiduMapSDK_Util:7.5.4' + // 全量定位组件 + implementation 'com.baidu.lbsyun:BaiduMapSDK_Location_All:9.3.7' + // #4834 添加 Timber 日志库（用于日志输出到外置存储） implementation 'com.jakewharton.timber:timber:5.0.1' @@ -8,4 +58,116 @@ // This includes the LIST command fix (endsWith("/") check) // Remove this line after builtinftp is updated to depend on ftpserver 2026.3.39+ implementation 'com.github.hxcan:ftpserver:2026.3.39' +} + +android +{ + lint + { + baseline = file("lint-baseline.xml") + } + + buildFeatures + { + buildConfig = true + } + + compileSdkVersion 33 + buildToolsVersion '28.0.3' + namespace 'com.stupidbeauty.sisterfuture' + + signingConfigs { + debug { + storeFile file('../keystore.31/debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' + } + } + + buildTypes + { + release + { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + debug + { + signingConfig signingConfigs.debug + } + } + + defaultConfig + { + applicationId "com.stupidbeauty.sisterfuture" + minSdkVersion 24 // 提升最低 API 级别以支持 ConcurrentHashMap.newKeySet() (API 24+) + targetSdkVersion 28 + versionCode 1091 + versionName "2026.3.26" + multiDexEnabled true + + // 配置支持的 SO 库架构 - 仅保留手机端需要的架构 + ndk + { + abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" + } + } + + sourceSets + { + main + { + jniLibs.srcDirs = ['libs'] + } + } + + aaptOptions { + noCompress "tflite" + } + + // #4800 抑制 D8 警告 - 针对第三方库的 stack map 表警告 + dexOptions { + additionalParameters = [ + '--no-warnings' + ] + } +} + +// # https://stackoverflow.com/questions/65380359/lomboks-access-to-jdk-compilers-internal-packages-incompatible-with-java-16 + +// # enable internal JDK API access at runtime +tasks.withType(JavaCompile).configureEach { + options.fork = true + options.forkOptions.jvmArgs += [ +// # essential for butterknife + '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED', + +// # if you need Glide or LomBok +// # these may not be the exact list, but it works for me + '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED', + ] +} +// 自定义 APK 输出文件名，包含版本信息 +android.applicationVariants.all { variant -> + variant.outputs.all { output -> + def versionName = variant.versionName + def versionCode = variant.versionCode + def buildTime = new Date().format('yyyyMMdd-HHmmss', TimeZone.getTimeZone('Asia/Shanghai')) + def buildType = variant.buildType.name + + if (buildType == 'debug') { + outputFileName = "sisterfuture-debug-v${versionName}-${versionCode}-${buildTime}.apk" + } else { + outputFileName = "sisterfuture-release-v${versionName}-${versionCode}-${buildTime}.apk" + } + } } \ No newline at end of file From 4bad3ca220ed698372f7dd61e5187c90fb3db838 Mon Sep 17 00:00:00 2001 From: sisterfuture Date: Tue, 31 Mar 2026 18:29:23 +0800 Subject: [PATCH 3/4] Remove explicit ftpserver dependency - now provided by builtinftp 2026.3.31 Since builtinftp 2026.3.31 now depends on ftpserver 2026.3.39 (with LIST command fix), we can remove the explicit ftpserver dependency declaration. The LIST command fix (endsWith("/") check) is now available through transitive dependency. --- app/build.gradle | 168 +---------------------------------------------- 1 file changed, 1 insertion(+), 167 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5dd6d6c7..70c8a658 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,173 +1,7 @@ -apply plugin: 'com.android.application' -apply plugin: 'io.objectbox' // 这个插件必须加！ -// ✅ 未来姐姐的测试注释：这是一个小修改 - -dependencies -{ - implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.jakewharton:butterknife:10.2.3' - annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' // ✄ 注意是 -compiler - implementation 'com.google.code.gson:gson:2.8.2' - implementation 'org.apache.commons:commons-lang3:3.4' - implementation 'org.apache.commons:commons-io:1.3.2' - implementation 'com.github.hxcan:CodePosition:2023.5.19' - implementation 'com.mcxiaoke.volley:library:1.0.19' - implementation 'com.squareup.okhttp3:okhttp:4.10.0' - implementation group: 'com.squareup.okhttp', name: 'okhttp', version: '1.6.0' - implementation group: 'com.koushikdutta.async', name: 'androidasync', version: '2.1.7' - implementation 'androidx.multidex:multidex:2.0.1' - implementation 'io.noties.markwon:core:4.6.1' - implementation 'com.jcraft:jsch:0.1.55' - implementation 'io.noties.markwon:ext-strikethrough:4.6.1' - implementation 'io.noties.markwon:ext-tables:4.6.1' - implementation 'com.belerweb:pinyin4j:2.5.1' - implementation 'androidx.annotation:annotation:1.5.0' - implementation 'androidx.appcompat:appcompat:1.6.1' // Or the latest version - implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'org.tensorflow:tensorflow-lite:1.12.0' - implementation 'org.tensorflow:tensorflow-lite-select-tf-ops:2.16.1' - implementation 'org.tensorflow:tensorflow-lite-support:0.4.4' - implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' // Or the latest version - implementation 'org.jetbrains:annotations:23.0.0' // Or the latest version - implementation 'androidx.recyclerview:recyclerview:1.3.0' // 或者使用最新的版本 - implementation 'com.github.hxcan:victoriafresh.android:2026.3.8' - implementation 'com.upokecenter:cbor:4.4.4' - // 在 dependencies 里加上 ObjectBox - implementation 'io.objectbox:objectbox-android:5.1.0' - // 添加注解处理器 - annotationProcessor 'io.objectbox:objectbox-processor:5.1.0' - implementation 'commons-net:commons-net:3.8.0' - - // #3088 百度地图 SDK 依赖（降级到 7.5.4，与旅行盲盒一致） - // 地图组件 - implementation 'com.baidu.lbsyun:BaiduMapSDK_Map:7.5.4' - // 检索组件（含反向地理编码） - implementation 'com.baidu.lbsyun:BaiduMapSDK_Search:7.5.4' - // 定位工具组件 - implementation 'com.baidu.lbsyun:BaiduMapSDK_Util:7.5.4' - // 全量定位组件 - implementation 'com.baidu.lbsyun:BaiduMapSDK_Location_All:9.3.7' - // #4834 添加 Timber 日志库（用于日志输出到外置存储） implementation 'com.jakewharton.timber:timber:5.0.1' // Builtin FTP Server - 最新版（用于数据备份） + // builtinftp 2026.3.31+ includes ftpserver 2026.3.39 with LIST command fix implementation 'com.github.hxcan:builtinftp:2026.3.31' - - // 🔍 FIX: Explicitly add ftpserver 2026.3.39 to override transitive dependency - // This includes the LIST command fix (endsWith("/") check) - // Remove this line after builtinftp is updated to depend on ftpserver 2026.3.39+ - implementation 'com.github.hxcan:ftpserver:2026.3.39' -} - -android -{ - lint - { - baseline = file("lint-baseline.xml") - } - - buildFeatures - { - buildConfig = true - } - - compileSdkVersion 33 - buildToolsVersion '28.0.3' - namespace 'com.stupidbeauty.sisterfuture' - - signingConfigs { - debug { - storeFile file('../keystore.31/debug.keystore') - storePassword 'android' - keyAlias 'androiddebugkey' - keyPassword 'android' - } - } - - buildTypes - { - release - { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - } - debug - { - signingConfig signingConfigs.debug - } - } - - defaultConfig - { - applicationId "com.stupidbeauty.sisterfuture" - minSdkVersion 24 // 提升最低 API 级别以支持 ConcurrentHashMap.newKeySet() (API 24+) - targetSdkVersion 28 - versionCode 1091 - versionName "2026.3.26" - multiDexEnabled true - - // 配置支持的 SO 库架构 - 仅保留手机端需要的架构 - ndk - { - abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" - } - } - - sourceSets - { - main - { - jniLibs.srcDirs = ['libs'] - } - } - - aaptOptions { - noCompress "tflite" - } - - // #4800 抑制 D8 警告 - 针对第三方库的 stack map 表警告 - dexOptions { - additionalParameters = [ - '--no-warnings' - ] - } -} - -// # https://stackoverflow.com/questions/65380359/lomboks-access-to-jdk-compilers-internal-packages-incompatible-with-java-16 - -// # enable internal JDK API access at runtime -tasks.withType(JavaCompile).configureEach { - options.fork = true - options.forkOptions.jvmArgs += [ -// # essential for butterknife - '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED', - -// # if you need Glide or LomBok -// # these may not be the exact list, but it works for me - '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED', - '--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED', - ] -} -// 自定义 APK 输出文件名，包含版本信息 -android.applicationVariants.all { variant -> - variant.outputs.all { output -> - def versionName = variant.versionName - def versionCode = variant.versionCode - def buildTime = new Date().format('yyyyMMdd-HHmmss', TimeZone.getTimeZone('Asia/Shanghai')) - def buildType = variant.buildType.name - - if (buildType == 'debug') { - outputFileName = "sisterfuture-debug-v${versionName}-${versionCode}-${buildTime}.apk" - } else { - outputFileName = "sisterfuture-release-v${versionName}-${versionCode}-${buildTime}.apk" - } - } } \ No newline at end of file From e504b9e062cf6f5fdfc5a47907afa71476305d99 Mon Sep 17 00:00:00 2001 From: sisterfuture Date: Tue, 31 Mar 2026 18:31:19 +0800 Subject: [PATCH 4/4] Fix: Restore complete app/build.gradle - remove explicit ftpserver dependency Previous commit accidentally replaced entire file with only a snippet. This restores the FULL build.gradle file (6KB+) with: 1. builtinftp: 2026.3.31 (includes ftpserver 2026.3.39 transitively) 2. REMOVED: Explicit ftpserver dependency (no longer needed) The LIST command fix is now available through builtinftp's transitive dependency. No need for explicit ftpserver declaration anymore. All other dependencies, plugins, configurations preserved exactly as in master. --- app/build.gradle | 162 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 162 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 70c8a658..30cba438 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,7 +1,169 @@ +apply plugin: 'com.android.application' +apply plugin: 'io.objectbox' // 这个插件必须加！ +// ✅ 未来姐姐的测试注释：这是一个小修改 + +dependencies +{ + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.jakewharton:butterknife:10.2.3' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' // ✄ 注意是 -compiler + implementation 'com.google.code.gson:gson:2.8.2' + implementation 'org.apache.commons:commons-lang3:3.4' + implementation 'org.apache.commons:commons-io:1.3.2' + implementation 'com.github.hxcan:CodePosition:2023.5.19' + implementation 'com.mcxiaoke.volley:library:1.0.19' + implementation 'com.squareup.okhttp3:okhttp:4.10.0' + implementation group: 'com.squareup.okhttp', name: 'okhttp', version: '1.6.0' + implementation group: 'com.koushikdutta.async', name: 'androidasync', version: '2.1.7' + implementation 'androidx.multidex:multidex:2.0.1' + implementation 'io.noties.markwon:core:4.6.1' + implementation 'com.jcraft:jsch:0.1.55' + implementation 'io.noties.markwon:ext-strikethrough:4.6.1' + implementation 'io.noties.markwon:ext-tables:4.6.1' + implementation 'com.belerweb:pinyin4j:2.5.1' + implementation 'androidx.annotation:annotation:1.5.0' + implementation 'androidx.appcompat:appcompat:1.6.1' // Or the latest version + implementation 'androidx.legacy:legacy-support-v4:1.0.0' + implementation 'org.tensorflow:tensorflow-lite:1.12.0' + implementation 'org.tensorflow:tensorflow-lite-select-tf-ops:2.16.1' + implementation 'org.tensorflow:tensorflow-lite-support:0.4.4' + implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.1.0' // Or the latest version + implementation 'org.jetbrains:annotations:23.0.0' // Or the latest version + implementation 'androidx.recyclerview:recyclerview:1.3.0' // 或者使用最新的版本 + implementation 'com.github.hxcan:victoriafresh.android:2026.3.8' + implementation 'com.upokecenter:cbor:4.4.4' + // 在 dependencies 里加上 ObjectBox + implementation 'io.objectbox:objectbox-android:5.1.0' + // 添加注解处理器 + annotationProcessor 'io.objectbox:objectbox-processor:5.1.0' + implementation 'commons-net:commons-net:3.8.0' + + // #3088 百度地图 SDK 依赖（降级到 7.5.4，与旅行盲盒一致） + // 地图组件 + implementation 'com.baidu.lbsyun:BaiduMapSDK_Map:7.5.4' + // 检索组件（含反向地理编码） + implementation 'com.baidu.lbsyun:BaiduMapSDK_Search:7.5.4' + // 定位工具组件 + implementation 'com.baidu.lbsyun:BaiduMapSDK_Util:7.5.4' + // 全量定位组件 + implementation 'com.baidu.lbsyun:BaiduMapSDK_Location_All:9.3.7' + // #4834 添加 Timber 日志库（用于日志输出到外置存储） implementation 'com.jakewharton.timber:timber:5.0.1' // Builtin FTP Server - 最新版（用于数据备份） // builtinftp 2026.3.31+ includes ftpserver 2026.3.39 with LIST command fix implementation 'com.github.hxcan:builtinftp:2026.3.31' +} + +android +{ + lint + { + baseline = file("lint-baseline.xml") + } + + buildFeatures + { + buildConfig = true + } + + compileSdkVersion 33 + buildToolsVersion '28.0.3' + namespace 'com.stupidbeauty.sisterfuture' + + signingConfigs { + debug { + storeFile file('../keystore.31/debug.keystore') + storePassword 'android' + keyAlias 'androiddebugkey' + keyPassword 'android' + } + } + + buildTypes + { + release + { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' + } + debug + { + signingConfig signingConfigs.debug + } + } + + defaultConfig + { + applicationId "com.stupidbeauty.sisterfuture" + minSdkVersion 24 // 提升最低 API 级别以支持 ConcurrentHashMap.newKeySet() (API 24+) + targetSdkVersion 28 + versionCode 1091 + versionName "2026.3.26" + multiDexEnabled true + + // 配置支持的 SO 库架构 - 仅保留手机端需要的架构 + ndk + { + abiFilters "armeabi", "armeabi-v7a", "arm64-v8a" + } + } + + sourceSets + { + main + { + jniLibs.srcDirs = ['libs'] + } + } + + aaptOptions { + noCompress "tflite" + } + + // #4800 抑制 D8 警告 - 针对第三方库的 stack map 表警告 + dexOptions { + additionalParameters = [ + '--no-warnings' + ] + } +} + +// # https://stackoverflow.com/questions/65380359/lomboks-access-to-jdk-compilers-internal-packages-incompatible-with-java-16 + +// # enable internal JDK API access at runtime +tasks.withType(JavaCompile).configureEach { + options.fork = true + options.forkOptions.jvmArgs += [ +// # essential for butterknife + '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED', + +// # if you need Glide or LomBok +// # these may not be the exact list, but it works for me + '--add-opens=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED', + '--add-opens=jdk.compiler/com.sun.tools.javac.jvm=ALL-UNNAMED', + ] +} +// 自定义 APK 输出文件名，包含版本信息 +android.applicationVariants.all { variant -> + variant.outputs.all { output -> + def versionName = variant.versionName + def versionCode = variant.versionCode + def buildTime = new Date().format('yyyyMMdd-HHmmss', TimeZone.getTimeZone('Asia/Shanghai')) + def buildType = variant.buildType.name + + if (buildType == 'debug') { + outputFileName = "sisterfuture-debug-v${versionName}-${versionCode}-${buildTime}.apk" + } else { + outputFileName = "sisterfuture-release-v${versionName}-${versionCode}-${buildTime}.apk" + } + } } \ No newline at end of file