diff --git a/1xhuat/build.gradle b/1xhuat/build.gradle index e5b61c3..34cab7b 100644 --- a/1xhuat/build.gradle +++ b/1xhuat/build.gradle @@ -61,8 +61,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/1xsgd/build.gradle b/1xsgd/build.gradle index 8d21246..7980be4 100644 --- a/1xsgd/build.gradle +++ b/1xsgd/build.gradle @@ -66,8 +66,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/base/build.gradle b/base/build.gradle index 9b24046..9e4cbd8 100644 --- a/base/build.gradle +++ b/base/build.gradle @@ -12,8 +12,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } buildFeatures { diff --git a/base/src/main/java/com/webclip/base/ActionConfirmDialog.java b/base/src/main/java/com/webclip/base/ActionConfirmDialog.java index 86599dd..741a976 100644 --- a/base/src/main/java/com/webclip/base/ActionConfirmDialog.java +++ b/base/src/main/java/com/webclip/base/ActionConfirmDialog.java @@ -29,7 +29,6 @@ public class ActionConfirmDialog extends Dialog { public interface OnToActionListener { void toSumbit(); void toCancel(); - } public void setOnToActionListener(OnToActionListener onNextCallListener) { diff --git a/base_noupdata/build.gradle b/base_noupdata/build.gradle index 4ea27dc..4a5cf94 100644 --- a/base_noupdata/build.gradle +++ b/base_noupdata/build.gradle @@ -12,8 +12,8 @@ android { } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } buildFeatures { diff --git a/build.gradle b/build.gradle index 1d63cd8..dbc2cb6 100644 --- a/build.gradle +++ b/build.gradle @@ -9,4 +9,5 @@ ext { versionCode = 133 versionName = "v1.3.3" namespace = "com.webclip.base" + JAVA_VERSION = JavaVersion.VERSION_17 } \ No newline at end of file diff --git a/cucislot365/build.gradle b/cucislot365/build.gradle index 961adf9..9ec8d88 100644 --- a/cucislot365/build.gradle +++ b/cucislot365/build.gradle @@ -64,8 +64,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/lorongjudi33/build.gradle b/lorongjudi33/build.gradle index a10f755..9f6e9ce 100644 --- a/lorongjudi33/build.gradle +++ b/lorongjudi33/build.gradle @@ -62,8 +62,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/powercuci/build.gradle b/powercuci/build.gradle index ee0cb96..24797ee 100644 --- a/powercuci/build.gradle +++ b/powercuci/build.gradle @@ -66,8 +66,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> @@ -94,5 +94,8 @@ android { } dependencies { + //基础模块 涉及的敏感权限只有版本更新的 安装app权限 implementation project(path: ':base') + //基础模块 不包含任何的系统权限 两个基础包 按需选择 + //implementation project(path: ':base_noupdata') } \ No newline at end of file diff --git a/protein/build.gradle b/protein/build.gradle index 7799ac1..af66c29 100644 --- a/protein/build.gradle +++ b/protein/build.gradle @@ -66,8 +66,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/redspin8/build.gradle b/redspin8/build.gradle index df98f09..13343f0 100644 --- a/redspin8/build.gradle +++ b/redspin8/build.gradle @@ -67,8 +67,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/telur33/build.gradle b/telur33/build.gradle index cab38a7..9c6e740 100644 --- a/telur33/build.gradle +++ b/telur33/build.gradle @@ -61,8 +61,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/winway/build.gradle b/winway/build.gradle index b521c92..b07e9f8 100644 --- a/winway/build.gradle +++ b/winway/build.gradle @@ -66,8 +66,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/winway_jisuanqi/build.gradle b/winway_jisuanqi/build.gradle index 6e0fda7..5dc3081 100644 --- a/winway_jisuanqi/build.gradle +++ b/winway_jisuanqi/build.gradle @@ -69,8 +69,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant -> diff --git a/workbuddy/build.gradle b/workbuddy/build.gradle index 663aa23..a2e6f29 100644 --- a/workbuddy/build.gradle +++ b/workbuddy/build.gradle @@ -68,8 +68,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_17 - targetCompatibility JavaVersion.VERSION_17 + sourceCompatibility rootProject.ext.JAVA_VERSION + targetCompatibility rootProject.ext.JAVA_VERSION } applicationVariants.all { variant ->