master/schildichat-android
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'release/1.6.40' into main

Browse Source
This commit is contained in:
Benoit Marty 2025-06-02 13:20:59 +02:00
commit cc87d23f82
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGES.md
View File

@ -1,3 +1,8 @@
Changes in Element v1.6.40 (2025-06-02)
=======================================
- Bump org.matrix.rustcomponents:crypto-android to 0.11.0 ([#9036](https://github.com/element-hq/element-android/pull/9036))
Changes in Element v1.6.38 (2025-05-27) Changes in Element v1.6.38 (2025-05-27)
======================================= =======================================

2
fastlane/metadata/android/en-US/changelogs/40106400.txt Normal file
View File

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

4
matrix-sdk-android/build.gradle
View File

@ -62,7 +62,7 @@ android {
// that the app's state is completely cleared between tests. // that the app's state is completely cleared between tests.
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'
buildConfigField "String", "SDK_VERSION", "\"1.6.38\"" buildConfigField "String", "SDK_VERSION", "\"1.6.40\""
buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\"" buildConfigField "String", "GIT_SDK_REVISION", "\"${gitRevision()}\""
buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\"" buildConfigField "String", "GIT_SDK_REVISION_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
@ -221,7 +221,7 @@ dependencies {
implementation libs.google.phonenumber implementation libs.google.phonenumber
implementation("org.matrix.rustcomponents:crypto-android:0.6.0") implementation("org.matrix.rustcomponents:crypto-android:0.11.0")
// api project(":library:rustCrypto") // api project(":library:rustCrypto")
testImplementation libs.tests.junit testImplementation libs.tests.junit

2
vector-app/build.gradle
View File

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