From 885dc0d8dfb14f912ea15ce91bf7ec9d6efd15a6 Mon Sep 17 00:00:00 2001 From: sisterfuture Date: Wed, 13 May 2026 10:26:22 +0800 Subject: [PATCH 1/2] Update ftpserver library to version 2026.5.13 for debug logging --- app/build.gradle | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e36d67a..49842cb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,14 +1,10 @@ apply plugin: 'com.android.application' -android -{ - lint - { +android { + lint { baseline = file("lint-baseline.xml") } - - compileOptions - { + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -16,8 +12,7 @@ android compileSdkVersion 33 namespace 'com.stupidbeauty.builtinftp.demo' - defaultConfig - { + defaultConfig { buildToolsVersion = "30.0.3" applicationId "com.stupidbeauty.hxftpserver" minSdkVersion 21 @@ -26,30 +21,24 @@ android versionName "4683.2026.3.31" } // defaultConfig - buildTypes - { - debug - { + buildTypes { + debug { signingConfig signingConfigs.debug } - release - { + release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - signingConfigs - { - debug - { + signingConfigs { + debug { storeFile file('../keystore.31/debug.keystore') storePassword 'android' keyAlias 'androiddebugkey' keyPassword 'android' } } - applicationVariants.all { variant -> variant.outputs.all { output -> def appName = "hxftpserver" @@ -60,15 +49,14 @@ android } } -dependencies -{ +dependencies { implementation 'com.github.hxcan:victoriafresh.android:2026.3.8' implementation 'com.jakewharton:butterknife:10.2.3' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' implementation 'com.github.hxcan:feedback:2026.3.34' implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'com.github.hxcan:upgrademanager:2025.8.1' - implementation 'com.github.hxcan:ftpserver:2026.3.39' + implementation 'com.github.hxcan:ftpserver:2026.5.13' implementation 'com.github.hxcan:rotatingactiveuser:2023.9.8' implementation 'com.upokecenter:cbor:4.2.0' implementation 'com.github.hxcan:voiceui:2024.6.6' @@ -93,7 +81,7 @@ tasks.withType(JavaCompile).configureEach { options.fork = true options.forkOptions.jvmArgs += [ // # essential for butterknife - '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED', + '--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 From c825038b46eb60e71d7aa3a92f1de7cf98971b19 Mon Sep 17 00:00:00 2001 From: sisterfuture Date: Wed, 13 May 2026 10:31:33 +0800 Subject: [PATCH 2/2] Update ftpserver library to version 2026.5.13 for debug logging --- app/build.gradle | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 49842cb..ad3b207 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,10 +1,14 @@ apply plugin: 'com.android.application' -android { - lint { +android +{ + lint + { baseline = file("lint-baseline.xml") } - compileOptions { + + compileOptions + { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } @@ -12,7 +16,8 @@ android { compileSdkVersion 33 namespace 'com.stupidbeauty.builtinftp.demo' - defaultConfig { + defaultConfig + { buildToolsVersion = "30.0.3" applicationId "com.stupidbeauty.hxftpserver" minSdkVersion 21 @@ -21,24 +26,30 @@ android { versionName "4683.2026.3.31" } // defaultConfig - buildTypes { - debug { + buildTypes + { + debug + { signingConfig signingConfigs.debug } - release { + release + { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - signingConfigs { - debug { + signingConfigs + { + debug + { storeFile file('../keystore.31/debug.keystore') storePassword 'android' keyAlias 'androiddebugkey' keyPassword 'android' } } + applicationVariants.all { variant -> variant.outputs.all { output -> def appName = "hxftpserver" @@ -49,7 +60,8 @@ android { } } -dependencies { +dependencies +{ implementation 'com.github.hxcan:victoriafresh.android:2026.3.8' implementation 'com.jakewharton:butterknife:10.2.3' annotationProcessor 'com.jakewharton:butterknife-compiler:10.2.3' @@ -81,7 +93,7 @@ tasks.withType(JavaCompile).configureEach { options.fork = true options.forkOptions.jvmArgs += [ // # essential for butterknife - '--add-opens=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED, + '--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