Merge branch 'release/1.6.36' into main

This commit is contained in:
Benoit Marty 2025-03-14 16:58:47 +01:00
commit 5179f93470
4 changed files with 10 additions and 2 deletions

View File

@ -1,3 +1,9 @@
Changes in Element v1.6.36 (2025-03-14)
=======================================
No significant changes.
Changes in Element v1.6.34 (2025-03-07)
=======================================

View File

@ -0,0 +1,2 @@
Main changes in this version: no significant change.
Full changelog: https://github.com/element-hq/element-android/releases

View File

@ -62,7 +62,7 @@ android {
// that the app's state is completely cleared between tests.
testInstrumentationRunnerArguments clearPackageData: 'true'
buildConfigField "String", "SDK_VERSION", "\"1.6.34\""
buildConfigField "String", "SDK_VERSION", "\"1.6.36\""
buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""

View File

@ -37,7 +37,7 @@ ext.versionMinor = 6
// Note: even values are reserved for regular release, odd values for hotfix release.
// When creating a hotfix, you should decrease the value, since the current value
// is the value for the next regular release.
ext.versionPatch = 34
ext.versionPatch = 36
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'