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

Better application id assembling

parent 432bc410
...@@ -26,12 +26,13 @@ android { ...@@ -26,12 +26,13 @@ android {
buildTypes { buildTypes {
debug { debug {
applicationIdSuffix rootProject.applicationIdDebugSuffix applicationIdSuffix rootProject.applicationIdBranch + rootProject.applicationIdDebugSuffix
buildConfigField ASSETS_CHECKSUM_FIELD_TYPE, ASSETS_CHECKSUM_FIELD_NAME, rootProject.ext.assetsChecksumPattern buildConfigField ASSETS_CHECKSUM_FIELD_TYPE, ASSETS_CHECKSUM_FIELD_NAME, rootProject.ext.assetsChecksumPattern
resValue "string", "app_name", "${tablexiaAppName}" resValue "string", "app_name", "${tablexiaAppName}"
} }
release { release {
debuggable false debuggable false
applicationIdSuffix rootProject.applicationIdBranch
buildConfigField ASSETS_CHECKSUM_FIELD_TYPE, ASSETS_CHECKSUM_FIELD_NAME, rootProject.ext.assetsChecksumPattern buildConfigField ASSETS_CHECKSUM_FIELD_TYPE, ASSETS_CHECKSUM_FIELD_NAME, rootProject.ext.assetsChecksumPattern
resValue "string", "app_name", "${tablexiaAppName}" resValue "string", "app_name", "${tablexiaAppName}"
} }
......
...@@ -47,9 +47,10 @@ allprojects { ...@@ -47,9 +47,10 @@ allprojects {
tablexiaAppName = getTablexiaAppName() tablexiaAppName = getTablexiaAppName()
tablexiaVersionName = getVersionNameFromGit() tablexiaVersionName = getVersionNameFromGit()
tablexiaVersionCode = getVersionCodeFromGit() tablexiaVersionCode = getVersionCodeFromGit()
applicationIdRelease = applicationBaseId + getTablexiaAppId() applicationIdBranch = getTablexiaAppId()
applicationIdDebugSuffix = getTablexiaAppId() applicationIdRelease = applicationBaseId + applicationIdBranch
applicationIdDebug = applicationBaseId + applicationIdDebugSuffix applicationIdDebugSuffix = '.debug'
applicationIdDebug = applicationIdRelease + applicationIdDebugSuffix
applicationIdDevelSuffix = '.devel' applicationIdDevelSuffix = '.devel'
applicationIdDevel = applicationBaseId + applicationIdDevelSuffix applicationIdDevel = applicationBaseId + applicationIdDevelSuffix
...@@ -261,7 +262,7 @@ def getTablexiaAppId() { ...@@ -261,7 +262,7 @@ def getTablexiaAppId() {
if (project.masterBranch.equals(branchName)) { if (project.masterBranch.equals(branchName)) {
return "" return ""
} else { } 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