Skip to content

Merge upstream v1.6.40 #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dontub merged 8 commits into from
Jun 19, 2025
Merged

Merge upstream v1.6.40 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1f91265
Merge tag 'v1.6.38' into develop
bmarty May 27, 2025
982335f
version++
bmarty May 27, 2025
f93369d
Bump `org.matrix.rustcomponents:crypto-android` to 0.11.0
richvdh May 28, 2025
9970053
Merge pull request #9036 from element-hq/rav/crypto_sdk_0_11_0
jmartinesp May 29, 2025
b9d21fe
Changelog for version 1.6.40
bmarty Jun 2, 2025
e264f38
Adding fastlane file for version 1.6.40
bmarty Jun 2, 2025
cc87d23
Merge branch 'release/1.6.40' into main
bmarty Jun 2, 2025
6fe0305
Merge tag 'v1.6.40' into synodim-merge-upstream
Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
=======================================

Expand Down
2 changes: 2 additions & 0 deletions fastlane/metadata/android/en-US/changelogs/40106400.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Main changes in this version: Bump SDK library.
Full changelog: https://github.com/element-hq/element-android/releases
4 changes: 2 additions & 2 deletions matrix-sdk-android/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ android {
// that the app's state is completely cleared between tests.
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_UNIX_DATE", "\"${gitRevisionUnixDate()}\""
Expand Down Expand Up @@ -221,7 +221,7 @@ dependencies {

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")

testImplementation libs.tests.junit
Expand Down
2 changes: 1 addition & 1 deletion vector-app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = 38
ext.versionPatch = 40

static def getGitTimestamp() {
def cmd = 'git show -s --format=%ct'
Expand Down