Skip to content

merge release changes into master #1260

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Elforama wants to merge 1 commit into
base: master
Choose a base branch
from
Open

merge release changes into master #1260

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@ obj/
treetracker.keys.properties
secrets.tar

# Keystore files
*.jks
*.keystore

#Fastlane
fastlane/report.xml
fastlane/.env
Expand Down
19 changes: 16 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,32 @@ def loadExtraProperties(String fileName) {
def props = new Properties()
props.load(new FileInputStream(fileName))
props.each { key, val ->
project.setProperty(key, val)
ext.set(key, val)
}
}

loadExtraProperties("treetracker.keys.properties")

android {
signingConfigs {
release {
def storeFilePath = project.hasProperty('release_store_file') ? project.property('release_store_file') : null
if (storeFilePath != null && !storeFilePath.toString().isEmpty()) {
storeFile file(storeFilePath)
storePassword project.property('release_store_password')
keyAlias project.property('release_key_alias')
keyPassword project.property('release_key_password')
}
}
}

compileSdk libs.versions.compileSdk.get().toInteger()
defaultConfig {
applicationId "org.greenstand.android.TreeTracker"
minSdk libs.versions.minSdk.get().toInteger()
targetSdk libs.versions.targetSdk.get().toInteger()
versionCode 197
versionName "2.2.0"
versionCode 202
versionName "2.2.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true
buildConfigField "String", "OBJECT_STORAGE_IDENTITY_POOL_ID", "\"${s3_production_identity_pool_id}\""
Expand Down Expand Up @@ -70,6 +82,7 @@ android {
buildTypes {
release {
minifyEnabled true
signingConfig signingConfigs.release
resValue "string", "app_name", "Tree Tracker"
buildConfigField "String", "OBJECT_STORAGE_IDENTITY_POOL_ID", "\"${s3_production_identity_pool_id}\""
buildConfigField 'String', 'OBJECT_STORAGE_ENDPOINT', '"eu-central-1"'
Expand Down
Loading