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!"/>
+
+
-
+
-
+
-
+
-
+
-
+
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