Studio/WinBoLL_Bck20260513_154646_588
Archived
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/aes' into winboll

Browse Source
This commit is contained in:
ZhangShaojian
2026-05-11 20:59:23 +08:00
parent 8f869e19cc f0fbdaf121
commit 83da84371c
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aes/build.gradle
View File

@@ -24,13 +24,13 @@ android {
defaultConfig { defaultConfig {
applicationId "cc.winboll.studio.aes" applicationId "cc.winboll.studio.aes"
minSdkVersion 21 minSdkVersion 26
targetSdkVersion 30 targetSdkVersion 30
versionCode 1 versionCode 1
// versionName 更新后需要手动设置 // versionName 更新后需要手动设置
// 项目模块目录的 build.gradle 文件的 stageCount=0 // 项目模块目录的 build.gradle 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "15.15" versionName "15.20"
if(true) { if(true) {
versionName = genVersionName("${versionName}") versionName = genVersionName("${versionName}")
} }

10
aes/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat Apr 25 04:16:42 HKT 2026 #Mon May 11 20:41:43 HKT 2026
stageCount=10 stageCount=3
libraryProject=libaes libraryProject=libaes
baseVersion=15.15 baseVersion=15.20
publishVersion=15.15.9 publishVersion=15.20.2
buildCount=0 buildCount=0
baseBetaVersion=15.15.10 baseBetaVersion=15.20.3

4
build.gradle
View File

@@ -96,8 +96,8 @@ allprojects {
// 1. 对纯 Java 模块的 JavaCompile 任务配置（升级为 Java 11） // 1. 对纯 Java 模块的 JavaCompile 任务配置（升级为 Java 11）
tasks.withType(JavaCompile) { tasks.withType(JavaCompile) {
options.compilerArgs << "-parameters" options.compilerArgs << "-parameters"
sourceCompatibility = JavaVersion.VERSION_1_7 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_1_7 targetCompatibility = JavaVersion.VERSION_11
// 可选：确保编码一致 // 可选：确保编码一致
options.encoding = "UTF-8" options.encoding = "UTF-8"
} }

6
libaes/build.gradle
View File

@@ -9,7 +9,7 @@ android {
buildToolsVersion "30.0.3" buildToolsVersion "30.0.3"
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 26
targetSdkVersion 30 targetSdkVersion 30
} }
@@ -27,8 +27,6 @@ android {
} }
dependencies { dependencies {
// 权限请求框架：https://github.com/getActivity/XXPermissions
api 'com.github.getActivity:XXPermissions:18.63'
// 下拉控件 // 下拉控件
api 'com.baoyz.pullrefreshlayout:library:1.2.0' api 'com.baoyz.pullrefreshlayout:library:1.2.0'
// 拼音搜索 // 拼音搜索
@@ -63,7 +61,7 @@ dependencies {
//annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' //annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0'
// WinBoLL库 nexus.winboll.cc 地址 // WinBoLL库 nexus.winboll.cc 地址
api 'cc.winboll.studio:libappbase:15.15.19' api 'cc.winboll.studio:libappbase:15.20.8'
// 备用库 jitpack.io 地址 // 备用库 jitpack.io 地址
//api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3' //api 'com.github.ZhanGSKen:APPBase:appbase-v15.15.3'

10
libaes/build.properties
View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat Apr 25 04:16:30 HKT 2026 #Mon May 11 20:41:30 HKT 2026
stageCount=10 stageCount=3
libraryProject=libaes libraryProject=libaes
baseVersion=15.15 baseVersion=15.20
publishVersion=15.15.9 publishVersion=15.20.2
buildCount=0 buildCount=0
baseBetaVersion=15.15.10 baseBetaVersion=15.20.3