Skip to content

Commit 6017379

Browse files
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 <[email protected]>
1 parent dc2bc71 commit 6017379

File tree

8 files changed

+26
-18
lines changed

8 files changed

+26
-18
lines changed

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ jsoup = "org.jsoup:jsoup:1.21.1"
176176
appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
177177
molecule-runtime = "app.cash.molecule:molecule-runtime:2.1.0"
178178
timber = "com.jakewharton.timber:timber:5.0.1"
179-
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.7.23"
179+
matrix_sdk = "org.matrix.rustcomponents:sdk-android:25.7.28"
180180
matrix_richtexteditor = { module = "io.element.android:wysiwyg", version.ref = "wysiwyg" }
181181
matrix_richtexteditor_compose = { module = "io.element.android:wysiwyg-compose", version.ref = "wysiwyg" }
182182
sqldelight-driver-android = { module = "app.cash.sqldelight:android-driver", version.ref = "sqldelight" }

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/room/RoomInfo.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ data class RoomInfo(
7575
val creators: ImmutableList<UserId>,
7676
val historyVisibility: RoomHistoryVisibility,
7777
val successorRoom: SuccessorRoom?,
78+
val roomVersion: String?,
79+
val privilegedCreatorRole: Boolean,
7880
) {
7981
val aliases: List<RoomAlias>
8082
get() = listOfNotNull(canonicalAlias) + alternativeAliases

libraries/matrix/impl/src/main/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapper.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ class RoomInfoMapper {
7171
numUnreadNotifications = it.numUnreadNotifications.toLong(),
7272
historyVisibility = it.historyVisibility.map(),
7373
successorRoom = it.successorRoom?.map(),
74+
roomVersion = it.roomVersion,
75+
privilegedCreatorRole = it.privilegedCreatorsRole,
7476
)
7577
}
7678
}

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/fixtures/factories/RoomInfo.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ fun aRustRoomInfo(
5555
joinRule: JoinRule? = null,
5656
historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
5757
successorRoom: SuccessorRoom? = null,
58+
roomVersion: String? = "11",
59+
privilegedCreatorsRole: Boolean = false,
5860
) = RoomInfo(
5961
id = id,
6062
displayName = displayName,
@@ -89,4 +91,6 @@ fun aRustRoomInfo(
8991
joinRule = joinRule,
9092
historyVisibility = historyVisibility,
9193
successorRoom = successorRoom,
94+
roomVersion = roomVersion,
95+
privilegedCreatorsRole = privilegedCreatorsRole,
9296
)

libraries/matrix/impl/src/test/kotlin/io/element/android/libraries/matrix/impl/room/RoomInfoMapperTest.kt

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,8 @@ class RoomInfoMapperTest {
8181
pinnedEventIds = listOf(AN_EVENT_ID.value),
8282
roomCreators = listOf(A_USER_ID.value),
8383
historyVisibility = RustRoomHistoryVisibility.Joined,
84+
roomVersion = "12",
85+
privilegedCreatorsRole = true,
8486
)
8587
)
8688
).isEqualTo(
@@ -126,7 +128,9 @@ class RoomInfoMapperTest {
126128
numUnreadNotifications = 13L,
127129
numUnreadMentions = 14L,
128130
historyVisibility = RoomHistoryVisibility.Joined,
129-
successorRoom = null
131+
successorRoom = null,
132+
roomVersion = "12",
133+
privilegedCreatorRole = true,
130134
)
131135
)
132136
}
@@ -168,6 +172,8 @@ class RoomInfoMapperTest {
168172
numUnreadMentions = 14uL,
169173
pinnedEventIds = emptyList(),
170174
roomCreators = null,
175+
roomVersion = "12",
176+
privilegedCreatorsRole = true,
171177
)
172178
)
173179
).isEqualTo(
@@ -208,6 +214,8 @@ class RoomInfoMapperTest {
208214
numUnreadNotifications = 13L,
209215
numUnreadMentions = 14L,
210216
historyVisibility = RoomHistoryVisibility.Joined,
217+
roomVersion = "12",
218+
privilegedCreatorRole = true,
211219
)
212220
)
213221
}

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomInfoFixture.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,8 @@ fun aRoomInfo(
6565
numUnreadNotifications: Long = 0,
6666
numUnreadMentions: Long = 0,
6767
historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
68+
roomVersion: String? = "11",
69+
privilegedCreatorRole: Boolean = false,
6870
) = RoomInfo(
6971
id = id,
7072
name = name,
@@ -99,4 +101,6 @@ fun aRoomInfo(
99101
numUnreadNotifications = numUnreadNotifications,
100102
numUnreadMentions = numUnreadMentions,
101103
historyVisibility = historyVisibility,
104+
roomVersion = roomVersion,
105+
privilegedCreatorRole = privilegedCreatorRole,
102106
)

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/room/RoomSummaryFixture.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,8 @@ fun aRoomSummary(
8080
numUnreadMentions: Long = 0,
8181
historyVisibility: RoomHistoryVisibility = RoomHistoryVisibility.Joined,
8282
lastMessage: RoomMessage? = aRoomMessage(),
83+
roomVersion: String? = "11",
84+
privilegedCreatorRole: Boolean = false,
8385
) = RoomSummary(
8486
info = RoomInfo(
8587
id = roomId,
@@ -115,6 +117,8 @@ fun aRoomSummary(
115117
numUnreadNotifications = numUnreadNotifications,
116118
numUnreadMentions = numUnreadMentions,
117119
historyVisibility = historyVisibility,
120+
roomVersion = roomVersion,
121+
privilegedCreatorRole = privilegedCreatorRole,
118122
),
119123
lastMessage = lastMessage,
120124
)

settings.gradle.kts

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,6 @@ pluginManagement {
1818
dependencyResolutionManagement {
1919
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
2020
repositories {
21-
// Snapshot versions
22-
maven {
23-
url = URI("https://s01.oss.sonatype.org/content/repositories/snapshots")
24-
content {
25-
includeModule("org.matrix.rustcomponents", "sdk-android")
26-
includeModule("io.element.android", "wysiwyg")
27-
includeModule("io.element.android", "wysiwyg-compose")
28-
}
29-
}
30-
// To have immediate access to Rust SDK versions without a sync with Maven Central
31-
maven {
32-
url = URI("https://s01.oss.sonatype.org/content/repositories/releases")
33-
content {
34-
includeModule("org.matrix.rustcomponents", "sdk-android")
35-
}
36-
}
3721
google()
3822
mavenCentral()
3923
maven {

0 commit comments

Comments
 (0)