Merge branch 'release/1.6.48'

This commit is contained in:
ganfra 2025-10-15 10:19:48 +02:00
commit 0dacb16bac
4 changed files with 13 additions and 4 deletions

View File

@ -1,3 +1,10 @@
Changes in Element v1.6.48 (2025-10-15)
=======================================
Other changes
-------------
- Change the app name to Element Classic. ([#9094](https://github.com/element-hq/element-android/issues/9094))
Changes in Element v1.6.46 (2025-09-22)
=======================================

View File

@ -0,0 +1,2 @@
Main changes in this version: change app name.
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.46\""
buildConfigField "String", "SDK_VERSION", "\"1.6.48\""
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 = 46
ext.versionPatch = 48
static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
@ -247,7 +247,7 @@ android {
debug {
applicationIdSuffix ".debug"
signingConfig signingConfigs.debug
resValue "string", "app_name", "Element - dbg"
resValue "string", "app_name", "Element Classic - dbg"
if (project.hasProperty("coverage")) {
testCoverageEnabled = project.coverage == "true"
@ -255,7 +255,7 @@ android {
}
release {
resValue "string", "app_name", "Element"
resValue "string", "app_name", "Element Classic"
postprocessing {
// FIXME Set to true.
removeUnusedCode false