Increment version
Change-Id: I37bb4499dba5aae301cd6f34a6241de6e0328184
This commit is contained in:
parent
526fe77b6a
commit
22b5d7d6bd
|
@ -0,0 +1 @@
|
||||||
|
- Update codebase to Element v1.6.3
|
|
@ -39,7 +39,7 @@ ext.versionMinor = 6
|
||||||
// is the value for the next regular release.
|
// is the value for the next regular release.
|
||||||
ext.versionPatch = 3
|
ext.versionPatch = 3
|
||||||
|
|
||||||
ext.scVersion = 68
|
ext.scVersion = 69
|
||||||
|
|
||||||
static def getGitTimestamp() {
|
static def getGitTimestamp() {
|
||||||
def cmd = 'git show -s --format=%ct'
|
def cmd = 'git show -s --format=%ct'
|
||||||
|
@ -156,8 +156,8 @@ android {
|
||||||
renderscriptTargetApi 24
|
renderscriptTargetApi 24
|
||||||
renderscriptSupportModeEnabled true
|
renderscriptSupportModeEnabled true
|
||||||
|
|
||||||
versionCode 40101080
|
versionCode 40101090
|
||||||
versionName "1.5.32.sc68"
|
versionName "1.6.3.sc69"
|
||||||
|
|
||||||
// Generate a random app task affinity
|
// Generate a random app task affinity
|
||||||
manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"]
|
manifestPlaceholders = [appTaskAffinitySuffix: "H_${gitRevision()}"]
|
||||||
|
@ -319,14 +319,14 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
dimension "store"
|
dimension "store"
|
||||||
versionName "1.5.32.sc68"
|
versionName "1.6.3.sc69"
|
||||||
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
|
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"G\""
|
||||||
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
|
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"GooglePlay\""
|
||||||
}
|
}
|
||||||
|
|
||||||
fdroid {
|
fdroid {
|
||||||
dimension "store"
|
dimension "store"
|
||||||
versionName "1.5.32.sc68"
|
versionName "1.6.3.sc69"
|
||||||
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
|
buildConfigField "String", "SHORT_FLAVOR_DESCRIPTION", "\"F\""
|
||||||
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
|
buildConfigField "String", "FLAVOR_DESCRIPTION", "\"FDroid\""
|
||||||
isDefault = true
|
isDefault = true
|
||||||
|
@ -334,7 +334,7 @@ android {
|
||||||
|
|
||||||
kotlinCrypto {
|
kotlinCrypto {
|
||||||
dimension "crypto"
|
dimension "crypto"
|
||||||
// versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
|
// versionName "1.6.3.sc69"
|
||||||
buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"olm-crypto\""
|
buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"olm-crypto\""
|
||||||
// buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\""
|
// buildConfigField "String", "FLAVOR_DESCRIPTION", "\"KotlinCrypto\""
|
||||||
}
|
}
|
||||||
|
@ -345,7 +345,7 @@ android {
|
||||||
// versionNameSuffix "-R"
|
// versionNameSuffix "-R"
|
||||||
// resValue "string", "app_name", "ER"
|
// resValue "string", "app_name", "ER"
|
||||||
|
|
||||||
// // versionName "${versionMajor}.${versionMinor}.${versionPatch}${getFdroidVersionSuffix()}"
|
// // versionName "1.6.3.sc69"
|
||||||
buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"rust-crypto\""
|
buildConfigField "String", "CRYPTO_FLAVOR_DESCRIPTION", "\"rust-crypto\""
|
||||||
// buildConfigField "String", "FLAVOR_DESCRIPTION", "\"RustCrypto\""
|
// buildConfigField "String", "FLAVOR_DESCRIPTION", "\"RustCrypto\""
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue