Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Fix/satisfy pipeline - gradle def function (EXPSOUREAPP-2572) #1519

Merged
merged 3 commits into from
Nov 3, 2020
Merged

Fix/satisfy pipeline - gradle def function (EXPSOUREAPP-2572) #1519

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d57f650
moved getHash call to DeviceForTesters Flavor to satisfy CircleCI
BMItr Nov 2, 2020
36bfad9
added variant prefix
BMItr Nov 3, 2020
d982639
Merge branch 'release/1.7.x' into fix/satisfy-circleCI-gradle-function
BMItr Nov 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Corona-Warn-App/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ android {

def prodEnvJson = environmentExtractor(file("../prod_environments.json"))
buildConfigField "String", "ENVIRONMENT_JSONDATA", prodEnvJson
buildConfigField "String", "GIT_COMMIT_SHORT_HASH", "\"${getHash()}\""

def devEnvironmentFile = file("../test_environments.json")
if (devEnvironmentFile.exists()) {
Expand Down Expand Up @@ -162,6 +161,7 @@ android {
variant.buildConfigField "String", "ENVIRONMENT_TYPE_DEFAULT", "\"${flavor.envTypeDefault[typeName]}\""

if (flavor.name == "deviceForTesters") {
variant.buildConfigField "String", "GIT_COMMIT_SHORT_HASH", "\"${getHash()}\""
def adjustedVersionName = "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-RC${VERSION_BUILD}"
variant.outputs.each { output ->
output.versionNameOverride = adjustedVersionName
Expand Down