From c67806163349c7a0daf609f898d4ad7541250022 Mon Sep 17 00:00:00 2001 From: wushaocheng <15876365887@163.com> Date: Thu, 13 Apr 2023 16:58:18 +0800 Subject: [PATCH] =?UTF-8?q?[Modify]=E5=AE=89=E5=8D=9310=E4=BB=A5=E4=B8=8A?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android_crop_lib/build.gradle | 6 +++--- app/build.gradle | 6 +++--- app/src/main/AndroidManifest.xml | 1 - core/build.gradle | 6 +++--- gradle.properties | 4 ++++ gradle/wrapper/gradle-wrapper.properties | 6 +++--- library/build.gradle | 6 +++--- nim_uikit/build.gradle | 6 +++--- 8 files changed, 22 insertions(+), 19 deletions(-) diff --git a/android_crop_lib/build.gradle b/android_crop_lib/build.gradle index 12078ccd5..201728462 100644 --- a/android_crop_lib/build.gradle +++ b/android_crop_lib/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 32 + compileSdkVersion COMPILE_SDK_VERSION.toInteger() defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion MIN_SDK_VERSION.toInteger() + targetSdkVersion TARGET_SDK_VERSION.toInteger() testApplicationId 'com.soundcloud.android.crop.test' testInstrumentationRunner 'android.test.InstrumentationTestRunner' diff --git a/app/build.gradle b/app/build.gradle index 906f310d6..71e2210f6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,12 +10,12 @@ apply plugin: 'android-junk-code' def onlyArm64 = Boolean.parseBoolean(only_arm64) android { - compileSdkVersion 32 + compileSdkVersion COMPILE_SDK_VERSION.toInteger() defaultConfig { applicationId "cn.nnbc123.voice" - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion MIN_SDK_VERSION.toInteger() + targetSdkVersion TARGET_SDK_VERSION.toInteger() versionCode Integer.valueOf(version_code) versionName version_name diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 97130ef85..7f0e5c4f5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -91,7 +91,6 @@ android:icon="@mipmap/app_logo" android:label="@string/app_name" android:largeHeap="true" - android:requestLegacyExternalStorage="true" android:resizeableActivity="true" android:supportsRtl="true" android:theme="@style/MyMaterialTheme" diff --git a/core/build.gradle b/core/build.gradle index b21d87e5b..1ee93dbe6 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -4,10 +4,10 @@ apply plugin: 'kotlin-android' apply from: '../mob.gradle' android { - compileSdkVersion 32 + compileSdkVersion COMPILE_SDK_VERSION.toInteger() defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion MIN_SDK_VERSION.toInteger() + targetSdkVersion TARGET_SDK_VERSION.toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/gradle.properties b/gradle.properties index 99a951ab1..38a2f1488 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,5 +25,9 @@ only_arm64=false channel_file=channel.txt +COMPILE_SDK_VERSION=32 +MIN_SDK_VERSION=21 +TARGET_SDK_VERSION=32 + version_name=1.1.0 version_code=110 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index ec22d73cf..f4e00e8ee 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Aug 09 10:54:29 CST 2018 +#Mon Apr 03 18:35:35 CST 2023 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip \ No newline at end of file +zipStoreBase=GRADLE_USER_HOME diff --git a/library/build.gradle b/library/build.gradle index 544403b43..c9d4ff6e6 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 32 + compileSdkVersion COMPILE_SDK_VERSION.toInteger() defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion MIN_SDK_VERSION.toInteger() + targetSdkVersion TARGET_SDK_VERSION.toInteger() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/nim_uikit/build.gradle b/nim_uikit/build.gradle index b60ee9aa6..ef8e0ac00 100644 --- a/nim_uikit/build.gradle +++ b/nim_uikit/build.gradle @@ -2,11 +2,11 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 32 + compileSdkVersion COMPILE_SDK_VERSION.toInteger() defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdkVersion MIN_SDK_VERSION.toInteger() + targetSdkVersion TARGET_SDK_VERSION.toInteger() renderscriptTargetApi 26 renderscriptSupportModeEnabled true