diff --git a/.gitignore b/.gitignore index 7051e76..4cd1c5e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,10 +1,10 @@ *.iml +*.aab .gradle /local.properties -/gradle.properties /.idea/ .DS_Store /build /captures -release.keystore -signing.properties +keystore.jks +keystore.properties diff --git a/app/build.gradle b/app/build.gradle index 93820db..6a9dd14 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,6 +2,10 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' +def keystorePropertiesFile = rootProject.file("keystore.properties") +def keystoreProperties = new Properties() +keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) + android { compileSdkVersion 28 buildToolsVersion "28.0.3" @@ -16,7 +20,12 @@ android { } signingConfigs { - release + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile file(keystoreProperties['storeFile']) + storePassword keystoreProperties['storePassword'] + } } buildTypes { @@ -45,22 +54,3 @@ dependencies { implementation 'com.squareup:otto:1.3.8' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3' } - -Properties props = new Properties() -def propFile = new File('signing.properties') -if (propFile.canRead()) { - props.load(new FileInputStream(propFile)) - - if (props != null && props.containsKey('STORE_FILE') && props.containsKey('KEY_ALIAS') && props.containsKey('PASSWORD')) { - android.signingConfigs.release.storeFile = file(props['STORE_FILE']) - android.signingConfigs.release.storePassword = props['PASSWORD'] - android.signingConfigs.release.keyAlias = props['KEY_ALIAS'] - android.signingConfigs.release.keyPassword = props['PASSWORD'] - } else { - println 'signing.properties found but some entries are missing' - android.buildTypes.release.signingConfig = null - } -} else { - println 'signing.properties not found' - android.buildTypes.release.signingConfig = null -} diff --git a/keystore.properties_sample b/keystore.properties_sample new file mode 100644 index 0000000..569edd7 --- /dev/null +++ b/keystore.properties_sample @@ -0,0 +1,4 @@ +storePassword=123456 +keyPassword=abcdef +keyAlias=myAlias +storeFile=../keystore.jks diff --git a/signing.properties_sample b/signing.properties_sample deleted file mode 100644 index 6b9a344..0000000 --- a/signing.properties_sample +++ /dev/null @@ -1,3 +0,0 @@ -STORE_FILE=/path/to/your.keystore -KEY_ALIAS=projectkeyalias -PASSWORD=yourkeypass