Increment version
Change-Id: I1ee9cd971db7e929c6828c5fc20a8e700cb70bda
This commit is contained in:
parent
16ca0951ca
commit
6076df81ed
|
@ -0,0 +1 @@
|
||||||
|
Update codebase to Element v1.4.34
|
|
@ -39,7 +39,7 @@ ext.versionMinor = 4
|
||||||
// is the value for the next regular release.
|
// is the value for the next regular release.
|
||||||
ext.versionPatch = 34
|
ext.versionPatch = 34
|
||||||
|
|
||||||
ext.scVersion = 57
|
ext.scVersion = 58
|
||||||
|
|
||||||
static def getGitTimestamp() {
|
static def getGitTimestamp() {
|
||||||
def cmd = 'git show -s --format=%ct'
|
def cmd = 'git show -s --format=%ct'
|
||||||
|
@ -145,10 +145,10 @@ android {
|
||||||
|
|
||||||
// `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode.
|
// `develop` branch will have version code from timestamp, to ensure each build from CI has a incremented versionCode.
|
||||||
// Other branches (main, features, etc.) will have version code based on application version.
|
// Other branches (main, features, etc.) will have version code based on application version.
|
||||||
versionCode 40100900
|
versionCode 40100910
|
||||||
|
|
||||||
// Required for sonar analysis
|
// Required for sonar analysis
|
||||||
versionName "1.4.32.sc57"
|
versionName "1.4.34.sc58"
|
||||||
|
|
||||||
// Generate a random app task affinity
|
// Generate a random app task affinity
|
||||||
manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"]
|
manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"]
|
||||||
|
@ -310,7 +310,7 @@ android {
|
||||||
dimension "store"
|
dimension "store"
|
||||||
isDefault = true
|
isDefault = true
|
||||||
|
|
||||||
versionName "1.4.32.sc57"
|
versionName "1.4.34.sc58"
|
||||||
|
|
||||||
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
|
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
|
||||||
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
|
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
|
||||||
|
@ -319,7 +319,7 @@ android {
|
||||||
fdroid {
|
fdroid {
|
||||||
dimension "store"
|
dimension "store"
|
||||||
|
|
||||||
versionName "1.4.32.sc57"
|
versionName "1.4.34.sc58"
|
||||||
|
|
||||||
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
|
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
|
||||||
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
|
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
|
||||||
|
|
Loading…
Reference in New Issue