diff --git a/app/build.gradle b/app/build.gradle index 9de61d6..6301479 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,17 +10,30 @@ android { versionName rootProject.ext.verName multiDexEnabled false + + signingConfigs { + config { + if (project.hasProperty('androidStoreFile') && !androidStoreFile.isEmpty()) { + storeFile = file(androidStoreFile) + storePassword = androidStorePassword + keyAlias = androidKeyAlias + keyPassword = androidKeyPassword + } + } + } } buildTypes { debug { debuggable true minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig = signingConfigs.config.storeFile == null ? signingConfigs.debug : signingConfigs.config } release { debuggable false minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + signingConfig = signingConfigs.config.storeFile == null ? signingConfigs.debug : signingConfigs.config } } lintOptions { diff --git a/build.gradle b/build.gradle index 96c930a..4c88de4 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ buildscript { maven { url "https://jitpack.io" } } dependencies { - classpath 'com.android.tools.build:gradle:7.0.0-beta03' + classpath 'com.android.tools.build:gradle:7.0.0-beta04' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.32" } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc0e207..10d1e63 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Apr 08 14:13:08 CST 2021 +#Thu Jun 17 15:35:10 CST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME