diff --git a/app/build.gradle b/app/build.gradle index 4fddb18..d52f375 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.detector" minSdkVersion 22 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1002 versionName "1.0.0.2" @@ -58,8 +58,8 @@ enabled true } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -67,7 +67,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.detector.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } diff --git a/app/build.gradle b/app/build.gradle index 4fddb18..d52f375 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.detector" minSdkVersion 22 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1002 versionName "1.0.0.2" @@ -58,8 +58,8 @@ enabled true } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -67,7 +67,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.detector.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f782953..b0832d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,9 +18,14 @@ - - - + + + + + + diff --git a/app/build.gradle b/app/build.gradle index 4fddb18..d52f375 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.detector" minSdkVersion 22 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1002 versionName "1.0.0.2" @@ -58,8 +58,8 @@ enabled true } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -67,7 +67,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.detector.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f782953..b0832d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,9 +18,14 @@ - - - + + + + + + diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt index 85ea0ed..7ece9b4 100644 --- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt @@ -10,6 +10,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/app/build.gradle b/app/build.gradle index 4fddb18..d52f375 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.detector" minSdkVersion 22 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1002 versionName "1.0.0.2" @@ -58,8 +58,8 @@ enabled true } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -67,7 +67,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.detector.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f782953..b0832d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,9 +18,14 @@ - - - + + + + + + diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt index 85ea0ed..7ece9b4 100644 --- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt @@ -10,6 +10,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/build.gradle b/build.gradle index bf95b75..987ad74 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ google() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.4' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' @@ -26,6 +26,6 @@ } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 4fddb18..d52f375 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ } } - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "com.casic.detector" minSdkVersion 22 - targetSdkVersion 31 + targetSdkVersion 33 versionCode 1002 versionName "1.0.0.2" @@ -58,8 +58,8 @@ enabled true } - applicationVariants.all { variant -> - variant.outputs.all { + applicationVariants.configureEach { variant -> + variant.outputs.configureEach { outputFileName = "COM_TCY_" + getBuildDate() + "_" + defaultConfig.versionName + ".apk" } } @@ -67,7 +67,7 @@ greendao { schemaVersion 1//数据库版本号 targetGenDir 'src/main/java'//设置DaoMaster、DaoSession、Dao目录 - daoPackage 'com.casic.detector.greendao'//设置DaoMaster、DaoSession、Dao包名 + daoPackage "${defaultConfig.applicationId}.greendao"//设置DaoMaster、DaoSession、Dao包名 } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index f782953..b0832d5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -18,9 +18,14 @@ - - - + + + + + + diff --git a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt index 85ea0ed..7ece9b4 100644 --- a/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt +++ b/app/src/main/java/com/casic/detector/utils/LocaleConstant.kt @@ -10,6 +10,7 @@ Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE, + Manifest.permission.MANAGE_EXTERNAL_STORAGE, Manifest.permission.CAMERA ) diff --git a/build.gradle b/build.gradle index bf95b75..987ad74 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ google() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.4' + classpath 'com.android.tools.build:gradle:4.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'org.greenrobot:greendao-gradle-plugin:3.3.0' @@ -26,6 +26,6 @@ } } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 201d355..e2cb0b1 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Fri May 26 14:13:49 CST 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME