From a1440443f141df2678ac49decebef1a33aeda383 Mon Sep 17 00:00:00 2001 From: oliexdev Date: Wed, 29 Apr 2020 07:28:04 +0200 Subject: [PATCH] move keystore load procedures in signing config to avoid loading error in travis --- android_app/app/build.gradle | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/android_app/app/build.gradle b/android_app/app/build.gradle index e8a2a534..e95ff670 100644 --- a/android_app/app/build.gradle +++ b/android_app/app/build.gradle @@ -1,17 +1,5 @@ apply plugin: 'com.android.application' -def keystorePropertiesFile = rootProject.file("../../openScale.keystore") -def keystoreProperties = new Properties() -keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) - -def keystoreLightPropertiesFile = rootProject.file("../../openScale_light.keystore") -def keystoreLightProperties = new Properties() -keystoreLightProperties.load(new FileInputStream(keystoreLightPropertiesFile)) - -def keystoreProPropertiesFile = rootProject.file("../../openScale_pro.keystore") -def keystoreProProperties = new Properties() -keystoreProProperties.load(new FileInputStream(keystoreProPropertiesFile)) - android { compileSdkVersion 29 defaultConfig { @@ -44,6 +32,10 @@ android { signingConfigs { release { + def keystorePropertiesFile = rootProject.file("../../openScale.keystore") + def keystoreProperties = new Properties() + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + storeFile file(rootDir.getCanonicalPath() + '/' + keystoreProperties['releaseKeyStore']) keyAlias keystoreProperties['releaseKeyAlias'] keyPassword keystoreProperties['releaseKeyPassword'] @@ -51,6 +43,10 @@ android { } light { + def keystoreLightPropertiesFile = rootProject.file("../../openScale_light.keystore") + def keystoreLightProperties = new Properties() + keystoreLightProperties.load(new FileInputStream(keystoreLightPropertiesFile)) + storeFile file(rootDir.getCanonicalPath() + '/' + keystoreLightProperties['releaseKeyStore']) keyAlias keystoreLightProperties['releaseKeyAlias'] keyPassword keystoreLightProperties['releaseKeyPassword'] @@ -58,6 +54,10 @@ android { } pro { + def keystoreProPropertiesFile = rootProject.file("../../openScale_pro.keystore") + def keystoreProProperties = new Properties() + keystoreProProperties.load(new FileInputStream(keystoreProPropertiesFile)) + storeFile file(rootDir.getCanonicalPath() + '/' + keystoreProProperties['releaseKeyStore']) keyAlias keystoreProProperties['releaseKeyAlias'] keyPassword keystoreProProperties['releaseKeyPassword']