diff --git a/app/build.gradle b/app/build.gradle
index c0c3a53..4b3aab9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,12 +16,12 @@
}
}
- compileSdkVersion 31
+ compileSdkVersion 33
defaultConfig {
applicationId "com.casic.xz.meterage"
minSdkVersion 23
- targetSdkVersion 31
+ targetSdkVersion 33
versionCode 1
versionName "1.0.0.0-beta"
@@ -85,8 +85,8 @@
enabled true
}
- applicationVariants.all { variant ->
- variant.outputs.all {
+ applicationVariants.configureEach { variant ->
+ variant.outputs.configureEach {
outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
}
}
@@ -94,7 +94,7 @@
greendao {
schemaVersion 1//数据库版本号
targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录
- daoPackage 'com.casic.xz.meterage.greendao'//设置DaoMaster、DaoSession、Dao包名
+ daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名
}
}
@@ -125,12 +125,13 @@
//图片压缩
implementation 'top.zibin:Luban:1.1.8'
//官方Json解析库
- implementation 'com.google.code.gson:gson:2.9.0'
+ implementation 'com.google.code.gson:gson:2.10.1'
+ def vm_version = "2.5.1"
//Kotlin协程
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+ implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}"
//MVVM+LiveData
- implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+ implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
//返回值转换器
implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
@@ -166,7 +167,6 @@
implementation 'com.huawei.hms:push:6.9.0.300'
implementation 'com.getui.opt:xmp:3.3.1' // 小米
implementation 'com.assist-v3:oppo:3.3.0' // oppo
- implementation 'com.google.code.gson:gson:2.9.0'
implementation 'commons-codec:commons-codec:1.15'
implementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.assist-v3:vivo:3.1.1' // vivo
diff --git a/app/build.gradle b/app/build.gradle
index c0c3a53..4b3aab9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -16,12 +16,12 @@
}
}
- compileSdkVersion 31
+ compileSdkVersion 33
defaultConfig {
applicationId "com.casic.xz.meterage"
minSdkVersion 23
- targetSdkVersion 31
+ targetSdkVersion 33
versionCode 1
versionName "1.0.0.0-beta"
@@ -85,8 +85,8 @@
enabled true
}
- applicationVariants.all { variant ->
- variant.outputs.all {
+ applicationVariants.configureEach { variant ->
+ variant.outputs.configureEach {
outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
}
}
@@ -94,7 +94,7 @@
greendao {
schemaVersion 1//数据库版本号
targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录
- daoPackage 'com.casic.xz.meterage.greendao'//设置DaoMaster、DaoSession、Dao包名
+ daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名
}
}
@@ -125,12 +125,13 @@
//图片压缩
implementation 'top.zibin:Luban:1.1.8'
//官方Json解析库
- implementation 'com.google.code.gson:gson:2.9.0'
+ implementation 'com.google.code.gson:gson:2.10.1'
+ def vm_version = "2.5.1"
//Kotlin协程
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+ implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}"
//MVVM+LiveData
- implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+ implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
//返回值转换器
implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
@@ -166,7 +167,6 @@
implementation 'com.huawei.hms:push:6.9.0.300'
implementation 'com.getui.opt:xmp:3.3.1' // 小米
implementation 'com.assist-v3:oppo:3.3.0' // oppo
- implementation 'com.google.code.gson:gson:2.9.0'
implementation 'commons-codec:commons-codec:1.15'
implementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.assist-v3:vivo:3.1.1' // vivo
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0ad556..0c25314 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,8 +16,13 @@
+
+
+
- variant.outputs.all {
+ applicationVariants.configureEach { variant ->
+ variant.outputs.configureEach {
outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
}
}
@@ -94,7 +94,7 @@
greendao {
schemaVersion 1//数据库版本号
targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录
- daoPackage 'com.casic.xz.meterage.greendao'//设置DaoMaster、DaoSession、Dao包名
+ daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名
}
}
@@ -125,12 +125,13 @@
//图片压缩
implementation 'top.zibin:Luban:1.1.8'
//官方Json解析库
- implementation 'com.google.code.gson:gson:2.9.0'
+ implementation 'com.google.code.gson:gson:2.10.1'
+ def vm_version = "2.5.1"
//Kotlin协程
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+ implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}"
//MVVM+LiveData
- implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+ implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
//返回值转换器
implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
@@ -166,7 +167,6 @@
implementation 'com.huawei.hms:push:6.9.0.300'
implementation 'com.getui.opt:xmp:3.3.1' // 小米
implementation 'com.assist-v3:oppo:3.3.0' // oppo
- implementation 'com.google.code.gson:gson:2.9.0'
implementation 'commons-codec:commons-codec:1.15'
implementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.assist-v3:vivo:3.1.1' // vivo
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0ad556..0c25314 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,8 +16,13 @@
+
+
+
- variant.outputs.all {
+ applicationVariants.configureEach { variant ->
+ variant.outputs.configureEach {
outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
}
}
@@ -94,7 +94,7 @@
greendao {
schemaVersion 1//数据库版本号
targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录
- daoPackage 'com.casic.xz.meterage.greendao'//设置DaoMaster、DaoSession、Dao包名
+ daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名
}
}
@@ -125,12 +125,13 @@
//图片压缩
implementation 'top.zibin:Luban:1.1.8'
//官方Json解析库
- implementation 'com.google.code.gson:gson:2.9.0'
+ implementation 'com.google.code.gson:gson:2.10.1'
+ def vm_version = "2.5.1"
//Kotlin协程
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+ implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}"
//MVVM+LiveData
- implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+ implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
//返回值转换器
implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
@@ -166,7 +167,6 @@
implementation 'com.huawei.hms:push:6.9.0.300'
implementation 'com.getui.opt:xmp:3.3.1' // 小米
implementation 'com.assist-v3:oppo:3.3.0' // oppo
- implementation 'com.google.code.gson:gson:2.9.0'
implementation 'commons-codec:commons-codec:1.15'
implementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.assist-v3:vivo:3.1.1' // vivo
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0ad556..0c25314 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,8 +16,13 @@
+
+
+
- variant.outputs.all {
+ applicationVariants.configureEach { variant ->
+ variant.outputs.configureEach {
outputFileName = "XZJL_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk"
}
}
@@ -94,7 +94,7 @@
greendao {
schemaVersion 1//数据库版本号
targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录
- daoPackage 'com.casic.xz.meterage.greendao'//设置DaoMaster、DaoSession、Dao包名
+ daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名
}
}
@@ -125,12 +125,13 @@
//图片压缩
implementation 'top.zibin:Luban:1.1.8'
//官方Json解析库
- implementation 'com.google.code.gson:gson:2.9.0'
+ implementation 'com.google.code.gson:gson:2.10.1'
+ def vm_version = "2.5.1"
//Kotlin协程
- implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
+ implementation "androidx.lifecycle:lifecycle-runtime-ktx:${vm_version}"
//MVVM+LiveData
- implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.5.1"
- implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.5.1"
+ implementation "androidx.lifecycle:lifecycle-livedata-ktx:${vm_version}"
+ implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:${vm_version}"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
//返回值转换器
implementation 'com.jakewharton.retrofit:retrofit2-kotlin-coroutines-adapter:0.9.2'
@@ -166,7 +167,6 @@
implementation 'com.huawei.hms:push:6.9.0.300'
implementation 'com.getui.opt:xmp:3.3.1' // 小米
implementation 'com.assist-v3:oppo:3.3.0' // oppo
- implementation 'com.google.code.gson:gson:2.9.0'
implementation 'commons-codec:commons-codec:1.15'
implementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.assist-v3:vivo:3.1.1' // vivo
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c0ad556..0c25314 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -16,8 +16,13 @@
+
+
+