Compare commits

...

16 Commits

Author SHA1 Message Date
ZhanGSKen
ed193119f6 设定版本号(baseBetaVersion 版本要比publishVersion 版本加多 1 个版本) 2025-04-28 00:36:58 +08:00
ZhanGSKen
f4a054663e 设定版本号 2025-04-27 21:02:50 +08:00
ZhanGSKen
d17dd8073d 编译测试 2025-04-27 21:00:31 +08:00
ZhanGSKen
7150974d01 根目录 Gradle 配置回复,移除就的秘钥配置文件。 2025-04-27 20:42:01 +08:00
ZhanGSKen
c2794e7322 回复先前版本 2025-04-27 20:28:37 +08:00
ZhanGSKen
4737ce92e1 <apputils>Start New Stage Version. 2025-04-27 11:14:42 +08:00
ZhanGSKen
839bf72eca <libappbase>Library Release 15.4.8 2025-04-27 11:03:44 +08:00
ZhanGSKen
3f2ec872f8 <appbase>APK 15.4.8 release Publish. 2025-04-27 11:03:35 +08:00
ZhanGSKen
b62cbc043b 移除类库依赖 2025-04-27 11:02:06 +08:00
ZhanGSKen
d0e7f1f56c <libappbase>Library Release 15.4.7 2025-04-27 10:06:01 +08:00
ZhanGSKen
39fe25f34f <appbase>APK 15.4.7 release Publish. 2025-04-27 10:05:40 +08:00
ZhanGSKen
94f444d6c7 更新版本号 2025-04-27 10:05:16 +08:00
ZhanGSKen
33952a90de <appbase>APK 15.2.6 release Publish. 2025-04-27 10:02:38 +08:00
ZhanGSKen
4c1fece9f0 更新秘钥配置方式 2025-04-27 09:59:15 +08:00
ZhanGSKen
b60de856ca Merge branch 'appbase' into winboll 2025-04-26 21:16:41 +08:00
ZhanGSKen
6cc04f8e6f 修正说明书标题部分 2025-04-26 17:52:58 +08:00
7 changed files with 38 additions and 49 deletions

View File

@@ -75,9 +75,9 @@ android {
def outputFileName=project.rootDir.name + "_${versionName}.apk" def outputFileName=project.rootDir.name + "_${versionName}.apk"
// 创建 WinBoll Studio 发布接口文件夹 // 创建 WinBoll Studio 发布接口文件夹
File fWinBoLLStudioDir = file("/sdcard/WinBoLLStudio/APKs"); File fWinBollStudioDir = file("/sdcard/WinBollStudio/APKs");
if(!fWinBoLLStudioDir.exists()) { if(!fWinBollStudioDir.exists()) {
//fWinBoLLStudioDir.mkdirs(); //fWinBollStudioDir.mkdirs();
// 如果没有发布接口文件就不用进行APK发布和源码管理操作 // 如果没有发布接口文件就不用进行APK发布和源码管理操作
// 当前编译环境不是 WinBoll 主机, 以下将忽略APK发布和源码管理操作。 // 当前编译环境不是 WinBoll 主机, 以下将忽略APK发布和源码管理操作。
println 'The current compilation environment is not in WinBoll host, and the following APK publishing and source management operations will be ignore.' println 'The current compilation environment is not in WinBoll host, and the following APK publishing and source management operations will be ignore.'
@@ -94,12 +94,12 @@ android {
// 如果正在调试,就拷贝到 WinBoll 备份管理文件夹 // 如果正在调试,就拷贝到 WinBoll 备份管理文件夹
// //
if(variant.flavorName == "beta"&&variant.buildType.name == "debug"){ if(variant.flavorName == "beta"&&variant.buildType.name == "debug"){
//File outBuildBckDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/${variant.buildType.name}") //File outBuildBckDir = new File(fWinBollStudioDir, "/${rootProject.name}/${variant.buildType.name}")
File outBuildBckDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}") File outBuildBckDir = new File(fWinBollStudioDir, "/" + project.rootDir.name + "/${variant.buildType.name}")
// 创建目标路径目录 // 创建目标路径目录
if(!outBuildBckDir.exists()) { if(!outBuildBckDir.exists()) {
outBuildBckDir.mkdirs(); outBuildBckDir.mkdirs();
println "Output Folder Created.(WinBoLLStudio) : " + outBuildBckDir.getAbsolutePath() println "Output Folder Created.(WinBollStudio) : " + outBuildBckDir.getAbsolutePath()
} }
if(outBuildBckDir.exists()) { if(outBuildBckDir.exists()) {
copy{ copy{
@@ -108,7 +108,7 @@ android {
rename { rename {
String fileName -> "${outputFileName}" String fileName -> "${outputFileName}"
} }
println "Output APK (WinBoLLStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}" println "Output APK (WinBollStudio): " + outBuildBckDir.getAbsolutePath() + "/${outputFileName}"
} }
// 检查编译标志位配置 // 检查编译标志位配置
assert (winbollBuildProps['buildCount'] != null) assert (winbollBuildProps['buildCount'] != null)
@@ -151,8 +151,8 @@ android {
String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk" String szCommonTagAPKName = project.rootDir.name + "_" + szShortVersionName + ".apk"
println "CommonTagAPKName is : " + szCommonTagAPKName println "CommonTagAPKName is : " + szCommonTagAPKName
//File outTagDir = new File(fWinBoLLStudioDir, "/${rootProject.name}/tag/") //File outTagDir = new File(fWinBollStudioDir, "/${rootProject.name}/tag/")
File outTagDir = new File(fWinBoLLStudioDir, "/" + project.rootDir.name + "/tag/") File outTagDir = new File(fWinBollStudioDir, "/" + project.rootDir.name + "/tag/")
// 创建目标路径目录 // 创建目标路径目录
if(!outTagDir.exists()) { if(!outTagDir.exists()) {
outTagDir.mkdirs(); outTagDir.mkdirs();

View File

@@ -1,6 +1,6 @@
# ☁ ☁ ☁ WinBoll APP ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ # ☁ ☁ ☁ WinBoLL APP ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁
# ☁ ☁ 这是 WinBoll 系列 APP 汇总项目。☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ # ☁ ☁ WinBoLL Studio Android 应用开源项目。☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁
# ☁ ☁ ☁ WinBoll 网站地址 https://www.winboll.cc/studio/app/ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁ # ☁ ☁ ☁ WinBoLL 网站地址 https://www.winboll.cc/ ☁ ☁ ☁ ☁ ☁ ☁ ☁ ☁
## WinBoll 提问 ## WinBoll 提问
同样是 /sdcard 目录,在开发 Android 应用时, 同样是 /sdcard 目录,在开发 Android 应用时,

View File

@@ -30,7 +30,7 @@ android {
// versionName 更新后需要手动设置 // versionName 更新后需要手动设置
// .winboll/winbollBuildProps.properties 文件的 stageCount=0 // .winboll/winbollBuildProps.properties 文件的 stageCount=0
// Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0"
versionName "15.2" versionName "15.6"
if(true) { if(true) {
versionName = genVersionName("${versionName}") versionName = genVersionName("${versionName}")
} }

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat Apr 26 12:27:57 GMT 2025 #Sun Apr 27 16:35:29 GMT 2025
stageCount=6 stageCount=0
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.2 baseVersion=15.6
publishVersion=15.2.5 publishVersion=15.6.0
buildCount=4 buildCount=2
baseBetaVersion=15.2.6 baseBetaVersion=15.6.1

View File

@@ -4,9 +4,13 @@ buildscript {
// 本地 Maven 仓库(默认路径为 ~/.m2/repository // 本地 Maven 仓库(默认路径为 ~/.m2/repository
mavenLocal() mavenLocal()
// 或自定义本地仓库路径 // 或自定义本地仓库路径
//maven { url "file:///sdcard/.m2/repository" } maven { url "file:///sdcard/.m2/repository" }
// 或自定义本地仓库路径
maven { url "file:///sdcard/ZhanGSKen/AIDE/MavenReps/repository" } // Nexus Maven 库地址
// "WinBoll Release"
maven { url "https://nexus.winboll.cc/repository/maven-public/" }
// "WinBoll Snapshot"
maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/public/' }
maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/google/' }
@@ -17,12 +21,6 @@ buildscript {
mavenCentral() mavenCentral()
google() google()
//mavenLocal() //mavenLocal()
// Nexus Maven 库地址
// "WinBoll Release"
maven { url "https://192.168.123.26:8801/repository/maven-public/" }
// "WinBoll Snapshot"
maven { url "https://192.168.123.26:8801/repository/maven-snapshots/" }
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32 classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32
@@ -33,12 +31,11 @@ buildscript {
allprojects { allprojects {
repositories { repositories {
// 本地 Maven 仓库(默认路径为 ~/.m2/repository // Nexus Maven 库地址
mavenLocal() // "WinBoll Release"
// 或自定义本地仓库路径 maven { url "https://nexus.winboll.cc/repository/maven-public/" }
//maven { url "file:///sdcard/.m2/repository" } // "WinBoll Snapshot"
// 或自定义本地仓库路径 maven { url "https://nexus.winboll.cc/repository/maven-snapshots/" }
maven { url "file:///sdcard/ZhanGSKen/AIDE/MavenReps/repository" }
maven { url 'https://maven.aliyun.com/repository/public/' } maven { url 'https://maven.aliyun.com/repository/public/' }
maven { url 'https://maven.aliyun.com/repository/google/' } maven { url 'https://maven.aliyun.com/repository/google/' }
@@ -48,13 +45,7 @@ allprojects {
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
mavenCentral() mavenCentral()
google() google()
//mavenLocal() mavenLocal()
// Nexus Maven 库地址
// "WinBoll Release"
maven { url "https://192.168.123.26:8801/repository/maven-public/" }
// "WinBoll Snapshot"
maven { url "https://192.168.123.26:8801/repository/maven-snapshots/" }
} }
ext { ext {
// 定义全局变量,常用于版本管理 // 定义全局变量,常用于版本管理
@@ -65,7 +56,6 @@ allprojects {
bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh" bashCommitAppPublishBuildFlagInfoFilePath = ".winboll/bashCommitAppPublishBuildFlagInfo.sh"
winbollFilePath = "winboll.properties" winbollFilePath = "winboll.properties"
//keyPropsFilePath = "winboll-x/current.keystore"
keyPropsFilePath = "current.keystore" keyPropsFilePath = "current.keystore"
// 定义 lint 输出文件 // 定义 lint 输出文件
lintXmlReportFilePath = "build/reports/lint-results.xml" lintXmlReportFilePath = "build/reports/lint-results.xml"

View File

@@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle #Created by .winboll/winboll_app_build.gradle
#Sat Apr 26 12:27:57 GMT 2025 #Sun Apr 27 16:35:29 GMT 2025
stageCount=6 stageCount=0
libraryProject=libappbase libraryProject=libappbase
baseVersion=15.2 baseVersion=15.6
publishVersion=15.2.5 publishVersion=15.6.0
buildCount=4 buildCount=2
baseBetaVersion=15.2.6 baseBetaVersion=15.6.1

Submodule winboll-x deleted from d94d70050f