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

2025-04-29 12:48:41 +08:00 · 2025-04-29 12:48:41 +08:00 · 0e4dc85dfa
commit 0e4dc85dfa
parent 204642a5cd 2be7e2cbaf
6 changed files with 7 additions and 7 deletions
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@ -25,7 +25,7 @@ android {
    defaultConfig {
        applicationId "cc.winboll.studio.appbase"
        minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
        versionCode 1
        // versionName 更新后需要手动设置 
        // .winboll/winbollBuildProps.properties 文件的 stageCount=0
--- a/appbase/build.properties
+++ b/appbase/build.properties
@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Apr 28 21:17:52 HKT 2025
+#Tue Apr 29 04:20:48 GMT 2025
 stageCount=4
 libraryProject=libappbase
 baseVersion=15.7
 publishVersion=15.7.3
-buildCount=0
+buildCount=5
 baseBetaVersion=15.7.4
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@ -5,7 +5,7 @@

    <application
        android:name=".App"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@drawable/ic_miapp"
        android:label="@string/app_name"
        android:theme="@style/MyAPPBaseTheme"
        android:resizeableActivity="true"
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@ -10,7 +10,7 @@ android {

    defaultConfig {
        minSdkVersion 24
-        targetSdkVersion 29
+        targetSdkVersion 30
    }
    buildTypes {
        release {
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Apr 28 21:17:52 HKT 2025
+#Tue Apr 29 04:20:48 GMT 2025
 stageCount=4
 libraryProject=libappbase
 baseVersion=15.7
 publishVersion=15.7.3
-buildCount=0
+buildCount=5
 baseBetaVersion=15.7.4
--- a/libappbase/src/main/res/drawable/ic_miapp.png
+++ b/libappbase/src/main/res/drawable/ic_miapp.png