Merge pull request #6679 from thundernest/keystore_properties

Prefix keystore properties with "k9mail."
This commit is contained in:
Wolf-Martell Montwé 2023-02-17 10:37:08 +01:00 committed by GitHub
commit 4e33fb6087
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions

View file

@ -119,15 +119,15 @@ android {
}
}
if (project.hasProperty('keyAlias')) {
android.signingConfigs.release.keyAlias = keyAlias
if (project.hasProperty('k9mail.keyAlias')) {
android.signingConfigs.release.keyAlias = project.property('k9mail.keyAlias')
}
if (project.hasProperty('keyPassword')) {
android.signingConfigs.release.keyPassword = keyPassword
if (project.hasProperty('k9mail.keyPassword')) {
android.signingConfigs.release.keyPassword = project.property('k9mail.keyPassword')
}
if (project.hasProperty('storeFile')) {
android.signingConfigs.release.storeFile = file(storeFile)
if (project.hasProperty('k9mail.storeFile')) {
android.signingConfigs.release.storeFile = file(project.property('k9mail.storeFile'))
}
if (project.hasProperty('storePassword')) {
android.signingConfigs.release.storePassword = storePassword
if (project.hasProperty('k9mail.storePassword')) {
android.signingConfigs.release.storePassword = project.property('k9mail.storePassword')
}

View file

@ -5,10 +5,10 @@
1. Download `tb-android keystore` from 1Password and place it somewhere outside the root of the Git repository.
2. Add the following to `~/.gradle/gradle.properties` (create the file if necessary)
```
storeFile=<path to keystore>
storePassword=<password 'tb-android keystore' in 1Password>
keyAlias=k9mail
keyPassword=<password 'k9mail@tb-android' in 1Password>
k9mail.storeFile=<path to keystore>
k9mail.storePassword=<password 'tb-android keystore' in 1Password>
k9mail.keyAlias=k9mail
k9mail.keyPassword=<password 'k9mail@tb-android' in 1Password>
```
## Release a beta version