Commit 9d7896ca authored by Matyáš Latner's avatar Matyáš Latner

Better application id assembling

parent 432bc410
......@@ -26,12 +26,13 @@ android {
buildTypes {
debug {
applicationIdSuffix rootProject.applicationIdDebugSuffix
applicationIdSuffix rootProject.applicationIdBranch + rootProject.applicationIdDebugSuffix
buildConfigField ASSETS_CHECKSUM_FIELD_TYPE, ASSETS_CHECKSUM_FIELD_NAME, rootProject.ext.assetsChecksumPattern
resValue "string", "app_name", "${tablexiaAppName}"
}
release {
debuggable false
applicationIdSuffix rootProject.applicationIdBranch
buildConfigField ASSETS_CHECKSUM_FIELD_TYPE, ASSETS_CHECKSUM_FIELD_NAME, rootProject.ext.assetsChecksumPattern
resValue "string", "app_name", "${tablexiaAppName}"
}
......
......@@ -47,9 +47,10 @@ allprojects {
tablexiaAppName = getTablexiaAppName()
tablexiaVersionName = getVersionNameFromGit()
tablexiaVersionCode = getVersionCodeFromGit()
applicationIdRelease = applicationBaseId + getTablexiaAppId()
applicationIdDebugSuffix = getTablexiaAppId()
applicationIdDebug = applicationBaseId + applicationIdDebugSuffix
applicationIdBranch = getTablexiaAppId()
applicationIdRelease = applicationBaseId + applicationIdBranch
applicationIdDebugSuffix = '.debug'
applicationIdDebug = applicationIdRelease + applicationIdDebugSuffix
applicationIdDevelSuffix = '.devel'
applicationIdDevel = applicationBaseId + applicationIdDevelSuffix
......@@ -261,7 +262,7 @@ def getTablexiaAppId() {
if (project.masterBranch.equals(branchName)) {
return ""
} else {
return branchName.trim().replaceAll('-', '').replaceAll('\\.', '').toLowerCase()
return ".${branchName.trim().replaceAll('-', '').replaceAll('\\.', '').toLowerCase()}"
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment