From 07edaa3dcb755184c43a9d1dd0328050b19396f6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 29 Jul 2025 11:45:52 +0200 Subject: [PATCH] Update dependency org.matrix.rustcomponents:sdk-android to v25.7.28 (#5088) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update dependency org.matrix.rustcomponents:sdk-android to v25.7.28 * Adapt to SDK changes * Remove Sonatype repos: use Maven Central instead --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jorge Martín --- gradle/libs.versions.toml | 2 +- .../libraries/matrix/api/room/RoomInfo.kt | 2 ++ .../libraries/matrix/impl/room/RoomInfoMapper.kt | 2 ++ .../matrix/impl/fixtures/factories/RoomInfo.kt | 4 ++++ .../matrix/impl/room/RoomInfoMapperTest.kt | 10 +++++++++- .../matrix/test/room/RoomInfoFixture.kt | 4 ++++ .../matrix/test/room/RoomSummaryFixture.kt | 4 ++++ settings.gradle.kts | 16 ---------------- 8 files changed, 26 insertions(+), 18 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7bc270702..999782c17c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -176,7 +176,7 @@ jsoup = "org.jsoup:jsoup:1.21.1" appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" } molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0" timber = "com.jakewharton.timber:timber:5.0.1" -matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.7.23" +matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.7.28" matrix_richtexteditor = { module = "io.element.android:wysiwyg", 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" } diff --git a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt index 812994af92..f3224d546b 100644 --- a/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt +++ b/libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt @@ -75,6 +75,8 @@ data class RoomInfo( val creators: ImmutableList, val historyVisibility: RoomHistoryVisibility, val successorRoom: SuccessorRoom?, + val roomVersion: String?, + val privilegedCreatorRole: Boolean, ) { val aliases: List get() = listOfNotNull(canonicalAlias) + alternativeAliases diff --git a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt index dda5bf2f3a..199abcad44 100644 --- a/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt +++ b/libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt @@ -71,6 +71,8 @@ class RoomInfoMapper { numUnreadNotifications = it.numUnreadNotifications.toLong(), historyVisibility = it.historyVisibility.map(), successorRoom = it.successorRoom?.map(), + roomVersion = it.roomVersion, + privilegedCreatorRole = it.privilegedCreatorsRole, ) } } diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt index 5596d44b48..b076b33f80 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt @@ -55,6 +55,8 @@ fun aRustRoomInfo( joinRule: JoinRule? = null, historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined, successorRoom: SuccessorRoom? = null, + roomVersion: String? = "11", + privilegedCreatorsRole: Boolean = false, ) = RoomInfo( id = id, displayName = displayName, @@ -89,4 +91,6 @@ fun aRustRoomInfo( joinRule = joinRule, historyVisibility = historyVisibility, successorRoom = successorRoom, + roomVersion = roomVersion, + privilegedCreatorsRole = privilegedCreatorsRole, ) diff --git a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt index d170bff029..90ff2b9211 100644 --- a/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt +++ b/libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt @@ -81,6 +81,8 @@ class RoomInfoMapperTest { pinnedEventIds = listOf(AN_EVENT_ID.value), roomCreators = listOf(A_USER_ID.value), historyVisibility = RustRoomHistoryVisibility.Joined, + roomVersion = "12", + privilegedCreatorsRole = true, ) ) ).isEqualTo( @@ -126,7 +128,9 @@ class RoomInfoMapperTest { numUnreadNotifications = 13L, numUnreadMentions = 14L, historyVisibility = RoomHistoryVisibility.Joined, - successorRoom = null + successorRoom = null, + roomVersion = "12", + privilegedCreatorRole = true, ) ) } @@ -168,6 +172,8 @@ class RoomInfoMapperTest { numUnreadMentions = 14uL, pinnedEventIds = emptyList(), roomCreators = null, + roomVersion = "12", + privilegedCreatorsRole = true, ) ) ).isEqualTo( @@ -208,6 +214,8 @@ class RoomInfoMapperTest { numUnreadNotifications = 13L, numUnreadMentions = 14L, historyVisibility = RoomHistoryVisibility.Joined, + roomVersion = "12", + privilegedCreatorRole = true, ) ) } diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt index c46173d86a..6955942146 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt @@ -65,6 +65,8 @@ fun aRoomInfo( numUnreadNotifications: Long = 0, numUnreadMentions: Long = 0, historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined, + roomVersion: String? = "11", + privilegedCreatorRole: Boolean = false, ) = RoomInfo( id = id, name = name, @@ -99,4 +101,6 @@ fun aRoomInfo( numUnreadNotifications = numUnreadNotifications, numUnreadMentions = numUnreadMentions, historyVisibility = historyVisibility, + roomVersion = roomVersion, + privilegedCreatorRole = privilegedCreatorRole, ) diff --git a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt index f415172cc2..9c16319d65 100644 --- a/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt +++ b/libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt @@ -80,6 +80,8 @@ fun aRoomSummary( numUnreadMentions: Long = 0, historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined, lastMessage: RoomMessage? = aRoomMessage(), + roomVersion: String? = "11", + privilegedCreatorRole: Boolean = false, ) = RoomSummary( info = RoomInfo( id = roomId, @@ -115,6 +117,8 @@ fun aRoomSummary( numUnreadNotifications = numUnreadNotifications, numUnreadMentions = numUnreadMentions, historyVisibility = historyVisibility, + roomVersion = roomVersion, + privilegedCreatorRole = privilegedCreatorRole, ), lastMessage = lastMessage, ) diff --git a/settings.gradle.kts b/settings.gradle.kts index f523b72fec..dd4bdd0ad4 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,22 +18,6 @@ pluginManagement { dependencyResolutionManagement { repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositories { - // Snapshot versions - maven { - url = URI("https://s01.oss.sonatype.org/content/repositories/snapshots") - content { - includeModule("org.matrix.rustcomponents", "sdk-android") - includeModule("io.element.android", "wysiwyg") - includeModule("io.element.android", "wysiwyg-compose") - } - } - // To have immediate access to Rust SDK versions without a sync with Maven Central - maven { - url = URI("https://s01.oss.sonatype.org/content/repositories/releases") - content { - includeModule("org.matrix.rustcomponents", "sdk-android") - } - } google() mavenCentral() maven {