Update dependency org.matrix.rustcomponents:sdk-android to v25.7.28 (#5088)

* 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 <jorgem@element.io>
This commit is contained in:
renovate[bot] 2025-07-29 11:45:52 +02:00 committed by GitHub
parent dc6734d530
commit 07edaa3dcb
8 changed files with 26 additions and 18 deletions

View file

@ -176,7 +176,7 @@ jsoup = "org.jsoup:jsoup:1.21.1"
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:2.1.0" molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0"
timber = "com.jakewharton.timber:timber:5.0.1" 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 = { 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" }

View file

@ -75,6 +75,8 @@ data class RoomInfo(
val creators: ImmutableList<UserId>, val creators: ImmutableList<UserId>,
val historyVisibility: RoomHistoryVisibility, val historyVisibility: RoomHistoryVisibility,
val successorRoom: SuccessorRoom?, val successorRoom: SuccessorRoom?,
val roomVersion: String?,
val privilegedCreatorRole: Boolean,
) { ) {
val aliases: List<RoomAlias> val aliases: List<RoomAlias>
get() = listOfNotNull(canonicalAlias) + alternativeAliases get() = listOfNotNull(canonicalAlias) + alternativeAliases

View file

@ -71,6 +71,8 @@ class RoomInfoMapper {
numUnreadNotifications = it.numUnreadNotifications.toLong(), numUnreadNotifications = it.numUnreadNotifications.toLong(),
historyVisibility = it.historyVisibility.map(), historyVisibility = it.historyVisibility.map(),
successorRoom = it.successorRoom?.map(), successorRoom = it.successorRoom?.map(),
roomVersion = it.roomVersion,
privilegedCreatorRole = it.privilegedCreatorsRole,
) )
} }
} }

View file

@ -55,6 +55,8 @@ fun aRustRoomInfo(
joinRule: JoinRule? = null, joinRule: JoinRule? = null,
historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined, historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
successorRoom: SuccessorRoom? = null, successorRoom: SuccessorRoom? = null,
roomVersion: String? = "11",
privilegedCreatorsRole: Boolean = false,
) = RoomInfo( ) = RoomInfo(
id = id, id = id,
displayName = displayName, displayName = displayName,
@ -89,4 +91,6 @@ fun aRustRoomInfo(
joinRule = joinRule, joinRule = joinRule,
historyVisibility = historyVisibility, historyVisibility = historyVisibility,
successorRoom = successorRoom, successorRoom = successorRoom,
roomVersion = roomVersion,
privilegedCreatorsRole = privilegedCreatorsRole,
) )

View file

@ -81,6 +81,8 @@ class RoomInfoMapperTest {
pinnedEventIds = listOf(AN_EVENT_ID.value), pinnedEventIds = listOf(AN_EVENT_ID.value),
roomCreators = listOf(A_USER_ID.value), roomCreators = listOf(A_USER_ID.value),
historyVisibility = RustRoomHistoryVisibility.Joined, historyVisibility = RustRoomHistoryVisibility.Joined,
roomVersion = "12",
privilegedCreatorsRole = true,
) )
) )
).isEqualTo( ).isEqualTo(
@ -126,7 +128,9 @@ class RoomInfoMapperTest {
numUnreadNotifications = 13L, numUnreadNotifications = 13L,
numUnreadMentions = 14L, numUnreadMentions = 14L,
historyVisibility = RoomHistoryVisibility.Joined, historyVisibility = RoomHistoryVisibility.Joined,
successorRoom = null successorRoom = null,
roomVersion = "12",
privilegedCreatorRole = true,
) )
) )
} }
@ -168,6 +172,8 @@ class RoomInfoMapperTest {
numUnreadMentions = 14uL, numUnreadMentions = 14uL,
pinnedEventIds = emptyList(), pinnedEventIds = emptyList(),
roomCreators = null, roomCreators = null,
roomVersion = "12",
privilegedCreatorsRole = true,
) )
) )
).isEqualTo( ).isEqualTo(
@ -208,6 +214,8 @@ class RoomInfoMapperTest {
numUnreadNotifications = 13L, numUnreadNotifications = 13L,
numUnreadMentions = 14L, numUnreadMentions = 14L,
historyVisibility = RoomHistoryVisibility.Joined, historyVisibility = RoomHistoryVisibility.Joined,
roomVersion = "12",
privilegedCreatorRole = true,
) )
) )
} }

View file

@ -65,6 +65,8 @@ fun aRoomInfo(
numUnreadNotifications: Long = 0, numUnreadNotifications: Long = 0,
numUnreadMentions: Long = 0, numUnreadMentions: Long = 0,
historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined, historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
roomVersion: String? = "11",
privilegedCreatorRole: Boolean = false,
) = RoomInfo( ) = RoomInfo(
id = id, id = id,
name = name, name = name,
@ -99,4 +101,6 @@ fun aRoomInfo(
numUnreadNotifications = numUnreadNotifications, numUnreadNotifications = numUnreadNotifications,
numUnreadMentions = numUnreadMentions, numUnreadMentions = numUnreadMentions,
historyVisibility = historyVisibility, historyVisibility = historyVisibility,
roomVersion = roomVersion,
privilegedCreatorRole = privilegedCreatorRole,
) )

View file

@ -80,6 +80,8 @@ fun aRoomSummary(
numUnreadMentions: Long = 0, numUnreadMentions: Long = 0,
historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined, historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
lastMessage: RoomMessage? = aRoomMessage(), lastMessage: RoomMessage? = aRoomMessage(),
roomVersion: String? = "11",
privilegedCreatorRole: Boolean = false,
) = RoomSummary( ) = RoomSummary(
info = RoomInfo( info = RoomInfo(
id = roomId, id = roomId,
@ -115,6 +117,8 @@ fun aRoomSummary(
numUnreadNotifications = numUnreadNotifications, numUnreadNotifications = numUnreadNotifications,
numUnreadMentions = numUnreadMentions, numUnreadMentions = numUnreadMentions,
historyVisibility = historyVisibility, historyVisibility = historyVisibility,
roomVersion = roomVersion,
privilegedCreatorRole = privilegedCreatorRole,
), ),
lastMessage = lastMessage, lastMessage = lastMessage,
) )

View file

@ -18,22 +18,6 @@ pluginManagement {
dependencyResolutionManagement { dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories { 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() google()
mavenCentral() mavenCentral()
maven { maven {