Skip to content
Snippets Groups Projects
Unverified Commit 518e84bd authored by chris-cwa's avatar chris-cwa Committed by GitHub
Browse files

Merge branch 'release/1.7.x' into 1.6_to_1.7

parents 694dd3bb 3ef2610f
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Corona-Warn-App/build.gradle
+ 1
− 1
View file @ 518e84bd
...@@ -75,7 +75,6 @@ android { ...@@ -75,7 +75,6 @@ android {
def prodEnvJson = environmentExtractor(file("../prod_environments.json")) def prodEnvJson = environmentExtractor(file("../prod_environments.json"))
buildConfigField "String", "ENVIRONMENT_JSONDATA", prodEnvJson buildConfigField "String", "ENVIRONMENT_JSONDATA", prodEnvJson
buildConfigField "String", "GIT_COMMIT_SHORT_HASH", "\"${getHash()}\""
def devEnvironmentFile = file("../test_environments.json") def devEnvironmentFile = file("../test_environments.json")
if (devEnvironmentFile.exists()) { if (devEnvironmentFile.exists()) {
...@@ -162,6 +161,7 @@ android { ...@@ -162,6 +161,7 @@ android {
variant.buildConfigField "String", "ENVIRONMENT_TYPE_DEFAULT", "\"${flavor.envTypeDefault[typeName]}\"" variant.buildConfigField "String", "ENVIRONMENT_TYPE_DEFAULT", "\"${flavor.envTypeDefault[typeName]}\""
if (flavor.name == "deviceForTesters") { if (flavor.name == "deviceForTesters") {
variant.buildConfigField "String", "GIT_COMMIT_SHORT_HASH", "\"${getHash()}\""
def adjustedVersionName = "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-RC${VERSION_BUILD}" def adjustedVersionName = "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-RC${VERSION_BUILD}"
variant.outputs.each { output -> variant.outputs.each { output ->
output.versionNameOverride = adjustedVersionName output.versionNameOverride = adjustedVersionName
......
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