From 404239de236187bae6fb59c7e42f13a2dcaaa304 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <ZhanGSKen@AliYun.Com>
Date: Tue, 25 Feb 2025 15:50:52 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BC=96=E8=AF=91=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=B7=B2=E5=AF=B9=E5=BA=94Android10=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=EF=BC=8CAPI=E7=BA=A7=E5=88=AB29=E3=80=82Java=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E7=89=88=E6=9C=AC=E4=B8=BA=20Java=208=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.gradle                          | 13 ++---
 appbase/build.properties                      |  4 +-
 appbase/src/main/res/layout/activity_main.xml | 53 +++++++++++--------
 build.gradle                                  |  8 +++
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 libappbase/build.gradle                       | 14 ++---
 libappbase/build.properties                   |  4 +-
 7 files changed, 51 insertions(+), 47 deletions(-)

diff --git a/appbase/build.gradle b/appbase/build.gradle
index 9d43b23a..93299dfa 100644
--- a/appbase/build.gradle
+++ b/appbase/build.gradle
@@ -18,13 +18,13 @@ def genVersionName(def versionName){
 }
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "cc.winboll.studio.appbase"
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
         versionCode 1
         // versionName 更新后需要手动设置 
         // .winboll/winbollBuildProps.properties 文件的 stageCount=0
@@ -41,11 +41,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
diff --git a/appbase/build.properties b/appbase/build.properties
index 143acac3..bb6d3e64 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Feb 21 11:03:47 HKT 2025
+#Tue Feb 25 07:48:47 GMT 2025
 stageCount=7
 libraryProject=libappbase
 baseVersion=1.5
 publishVersion=1.5.6
-buildCount=0
+buildCount=7
 baseBetaVersion=1.5.7
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 74141068..a17706a3 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -24,6 +24,13 @@
 			android:layout_height="wrap_content"
 			android:text="Hello, WinBoll!"/>
 
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="Android版本10的代号是“Q”，API级别是29。   Android 10开始谷歌不再公开使用甜品作为版本代号，但内部仍保留了大量与“Q”相关的元素。Android 10本身并没有严格对应某个特定的Java版本，但在开发Android 10应用时，通常可以使用Java 8或更高版本。
+ 
+Java 8为Android开发带来了诸如Lambda表达式、方法引用等新特性，能提高开发效率和代码可读性，与Android 10开发适配良好。Java 9及更高版本也可用于Android 10开发，能使用一些新的语言特性和API，但可能需要注意兼容性和配置问题。"/>
+
 		<LinearLayout
 			android:orientation="horizontal"
 			android:layout_width="match_parent"
@@ -61,33 +68,33 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content">
 
-                    <LinearLayout
-                        android:orientation="horizontal"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
+					<LinearLayout
+						android:orientation="horizontal"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content">
 
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="StartTestService"
-                            android:textAllCaps="false"
-                            android:onClick="onStartTestService"/>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="StartTestService"
+							android:textAllCaps="false"
+							android:onClick="onStartTestService"/>
 
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="StopTestService"
-                            android:textAllCaps="false"
-                            android:onClick="onStopTestService"/>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="StopTestService"
+							android:textAllCaps="false"
+							android:onClick="onStopTestService"/>
 
-                        <Button
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:text="StopTestServiceNoSettings"
-                            android:textAllCaps="false"
-                            android:onClick="onStopTestServiceNoSettings"/>
+						<Button
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:text="StopTestServiceNoSettings"
+							android:textAllCaps="false"
+							android:onClick="onStopTestServiceNoSettings"/>
 
-                    </LinearLayout>
+					</LinearLayout>
 
 				</HorizontalScrollView>
 
diff --git a/build.gradle b/build.gradle
index 757a4b25..01428f6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -69,6 +69,14 @@ allprojects {
             }
 	    }
     }
+    
+    subprojects {
+        tasks.withType(JavaCompile) {
+            options.compilerArgs << "-parameters"
+            sourceCompatibility = JavaVersion.VERSION_1_8
+            targetCompatibility = JavaVersion.VERSION_1_8
+        }
+    }
 }
 
 task clean(type: Delete) {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 5a1bbd3c..15070cbb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl = https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl = https\://services.gradle.org/distributions/gradle-8.4-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/libappbase/build.gradle b/libappbase/build.gradle
index 15ccce1f..594d80dd 100644
--- a/libappbase/build.gradle
+++ b/libappbase/build.gradle
@@ -4,14 +4,12 @@ apply from: '../.winboll/winboll_lib_build.gradle'
 apply from: '../.winboll/winboll_lint_build.gradle'
 
 android {
-    namespace 'cc.winboll.studio.libappbase'
-    
-    compileSdkVersion 32
-    buildToolsVersion "33.0.3"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 30
+        minSdkVersion 26
+        targetSdkVersion 29
     }
     buildTypes {
         release {
@@ -19,10 +17,6 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_11
-        targetCompatibility JavaVersion.VERSION_11
-    }
 }
 
 dependencies {
diff --git a/libappbase/build.properties b/libappbase/build.properties
index 61447f73..bb6d3e64 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Fri Feb 21 10:58:04 HKT 2025
+#Tue Feb 25 07:48:47 GMT 2025
 stageCount=7
 libraryProject=libappbase
 baseVersion=1.5
 publishVersion=1.5.6
-buildCount=0
+buildCount=7
 baseBetaVersion=1.5.7