Increment version
Change-Id: I046fe728801113e31b8590f7b18422d0f9f85fba
This commit is contained in:
parent
35a9c8a12f
commit
ca21a3fc43
|
@ -0,0 +1,4 @@
|
||||||
|
- Update codebase to Element v1.1.6
|
||||||
|
- Fix some upstream bugs
|
||||||
|
- Allow selecting text in the message longpress popup
|
||||||
|
- Enable rageshake / bug reporting
|
|
@ -16,7 +16,7 @@ ext.versionMajor = 1
|
||||||
ext.versionMinor = 1
|
ext.versionMinor = 1
|
||||||
ext.versionPatch = 6
|
ext.versionPatch = 6
|
||||||
|
|
||||||
ext.scVersion = 30
|
ext.scVersion = 31
|
||||||
|
|
||||||
static def getGitTimestamp() {
|
static def getGitTimestamp() {
|
||||||
def cmd = 'git show -s --format=%ct'
|
def cmd = 'git show -s --format=%ct'
|
||||||
|
@ -122,10 +122,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 (master, features, etc.) will have version code based on application version.
|
// Other branches (master, features, etc.) will have version code based on application version.
|
||||||
versionCode 40100440
|
versionCode 40100450
|
||||||
|
|
||||||
// Required for sonar analysis
|
// Required for sonar analysis
|
||||||
versionName "1.1.3.sc30"
|
versionName "1.1.6.sc31"
|
||||||
|
|
||||||
buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
|
buildConfigField "String", "GIT_REVISION", "\"${gitRevision()}\""
|
||||||
resValue "string", "git_revision", "\"${gitRevision()}\""
|
resValue "string", "git_revision", "\"${gitRevision()}\""
|
||||||
|
@ -244,7 +244,7 @@ android {
|
||||||
dimension "store"
|
dimension "store"
|
||||||
isDefault = true
|
isDefault = true
|
||||||
|
|
||||||
versionName "1.1.3.sc30"
|
versionName "1.1.6.sc31"
|
||||||
|
|
||||||
resValue "bool", "isGplay", "true"
|
resValue "bool", "isGplay", "true"
|
||||||
buildConfigField "boolean", "ALLOW_FCM_USE", "true"
|
buildConfigField "boolean", "ALLOW_FCM_USE", "true"
|
||||||
|
@ -255,7 +255,7 @@ android {
|
||||||
fdroid {
|
fdroid {
|
||||||
dimension "store"
|
dimension "store"
|
||||||
|
|
||||||
versionName "1.1.3.sc30"
|
versionName "1.1.6.sc31"
|
||||||
|
|
||||||
resValue "bool", "isGplay", "false"
|
resValue "bool", "isGplay", "false"
|
||||||
buildConfigField "boolean", "ALLOW_FCM_USE", "false"
|
buildConfigField "boolean", "ALLOW_FCM_USE", "false"
|
||||||
|
|
Loading…
Reference in New Issue