Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
Cwa App Android
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Felix Foertsch
Cwa App Android
Commits
094b29ba
Unverified
Commit
094b29ba
authored
4 years ago
by
Matthias Urhahn
Committed by
GitHub
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Don't show the RC/VERSION_BUILD extension in the versionName on non-tester builds. (#1394)
parent
42ddd0d8
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Corona-Warn-App/build.gradle
+13
-5
13 additions, 5 deletions
Corona-Warn-App/build.gradle
with
13 additions
and
5 deletions
Corona-Warn-App/build.gradle
+
13
−
5
View file @
094b29ba
...
@@ -45,15 +45,15 @@ android {
...
@@ -45,15 +45,15 @@ android {
minSdkVersion
23
minSdkVersion
23
targetSdkVersion
29
targetSdkVersion
29
versionCode
(
versionCode
(
VERSION_MAJOR
.
toInteger
()
*
1000000
VERSION_MAJOR
.
toInteger
()
*
1000000
+
VERSION_MINOR
.
toInteger
()
*
10000
+
VERSION_MINOR
.
toInteger
()
*
10000
+
VERSION_PATCH
.
toInteger
()
*
100
+
VERSION_PATCH
.
toInteger
()
*
100
+
VERSION_BUILD
.
toInteger
()
+
VERSION_BUILD
.
toInteger
()
)
)
println
(
"Used versionCode: $versionCode"
)
println
(
"Used versionCode: $versionCode"
)
versionName
"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
-RC${VERSION_BUILD}
"
versionName
"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
println
(
"Used versionName: $versionName"
)
println
(
"Used versionName: $versionName"
)
testInstrumentationRunner
"testhelpers.TestApplicationUIRunner"
testInstrumentationRunner
"testhelpers.TestApplicationUIRunner"
...
@@ -130,6 +130,14 @@ android {
...
@@ -130,6 +130,14 @@ android {
def
flavor
=
variant
.
productFlavors
[
0
]
def
flavor
=
variant
.
productFlavors
[
0
]
def
typeName
=
variant
.
buildType
.
name
// debug/release
def
typeName
=
variant
.
buildType
.
name
// debug/release
variant
.
buildConfigField
"String"
,
"ENVIRONMENT_TYPE_DEFAULT"
,
"\"${flavor.envTypeDefault[typeName]}\""
variant
.
buildConfigField
"String"
,
"ENVIRONMENT_TYPE_DEFAULT"
,
"\"${flavor.envTypeDefault[typeName]}\""
if
(
flavor
.
name
==
"deviceForTesters"
)
{
def
adjustedVersionName
=
"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}-RC${VERSION_BUILD}"
variant
.
outputs
.
each
{
output
->
output
.
versionNameOverride
=
adjustedVersionName
}
println
(
"deviceForTesters adjusted versionName: $adjustedVersionName"
)
}
}
}
buildFeatures
{
buildFeatures
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment