Browse Source

Merge branch 'develop' into feature/fga/mark_room_as_favorite

pull/2397/head
ganfra 7 months ago committed by GitHub
parent
commit
4a9f75be9a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 2
      .github/workflows/build.yml
  2. 8
      CHANGES.md
  3. 4
      fastlane/metadata/android/en-US/changelogs/40004040.txt
  4. 4
      gradle/libs.versions.toml
  5. 2
      plugins/src/main/kotlin/Versions.kt

2
.github/workflows/build.yml

@ -56,7 +56,7 @@ jobs:
path: | path: |
app/build/outputs/apk/gplay/debug/*.apk app/build/outputs/apk/gplay/debug/*.apk
app/build/outputs/apk/fdroid/debug/*.apk app/build/outputs/apk/fdroid/debug/*.apk
- uses: rnkdsh/action-upload-diawi@v1.5.4 - uses: rnkdsh/action-upload-diawi@v1.5.5
id: diawi id: diawi
# Do not fail the whole build if Diawi upload fails # Do not fail the whole build if Diawi upload fails
continue-on-error: true continue-on-error: true

8
CHANGES.md

@ -1,3 +1,11 @@
Changes in Element X v0.4.4 (2024-02-15)
========================================
Bugfixes 🐛
----------
- Fix decryption of previous messages after session verification not working.
Changes in Element X v0.4.3 (2024-02-14) Changes in Element X v0.4.3 (2024-02-14)
======================================== ========================================

4
fastlane/metadata/android/en-US/changelogs/40004040.txt

@ -0,0 +1,4 @@
Main changes in this version:
- Fix decryption of previous messages after session verification not working.
Full changelog: https://github.com/element-hq/element-x-android/releases

4
gradle/libs.versions.toml

@ -33,7 +33,7 @@ test_core = "1.5.0"
#other #other
coil = "2.5.0" coil = "2.5.0"
datetime = "0.5.0" datetime = "0.5.0"
dependencyAnalysis = "1.29.0" dependencyAnalysis = "1.30.0"
serialization_json = "1.6.2" serialization_json = "1.6.2"
showkase = "1.0.2" showkase = "1.0.2"
appyx = "1.4.0" appyx = "1.4.0"
@ -152,7 +152,7 @@ jsoup = "org.jsoup:jsoup:1.17.2"
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
molecule-runtime = "app.cash.molecule:molecule-runtime:1.3.2" molecule-runtime = "app.cash.molecule:molecule-runtime:1.3.2"
timber = "com.jakewharton.timber:timber:5.0.1" timber = "com.jakewharton.timber:timber:5.0.1"
matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.1" matrix_sdk = "org.matrix.rustcomponents:sdk-android:0.2.2"
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" } matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" } matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" } sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

2
plugins/src/main/kotlin/Versions.kt

@ -56,7 +56,7 @@ private const val versionMinor = 4
// 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.
private const val versionPatch = 5 private const val versionPatch = 6
object Versions { object Versions {
val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch val versionCode = 4_000_000 + versionMajor * 1_00_00 + versionMinor * 1_00 + versionPatch

Loading…
Cancel
Save