Skip to content

Commit b4f4695

Browse files
authored
Merge pull request #65 from matrix-org/ci/upgrade-ubuntu-runner-for-libc6-version
Upgrade the ubuntu CI runner to `24.04` to fix bindings
2 parents 359b95e + 81a628d commit b4f4695

File tree

4 files changed

+71
-24
lines changed

4 files changed

+71
-24
lines changed

.github/workflows/release_crypto.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
jobs:
1616
build_native:
1717
name: Build and generate crypto native libs
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-24.04
1919
env:
2020
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
2121
OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

.github/workflows/release_sdk_parallel.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
matrix:
1818
target: [ "aarch64-linux-android", "armv7-linux-androideabi", "i686-linux-android", "x86_64-linux-android" ]
1919
name: "Build Rust target: ${{ matrix.target }}"
20-
runs-on: ubuntu-latest
20+
runs-on: ubuntu-24.04
2121
outputs:
2222
linkable_ref: ${{ steps.set_linkable_ref.outputs.linkable_ref }}
2323

@@ -114,7 +114,7 @@ jobs:
114114
release_library:
115115
name: "Release SDK Library"
116116
needs: build_targets
117-
runs-on: ubuntu-latest
117+
runs-on: ubuntu-24.04
118118

119119
concurrency:
120120
group: ${{ github.ref }}-${{ github.job }}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object BuildVersionsSDK {
22
const val majorVersion = 0
33
const val minorVersion = 2
4-
const val patchVersion = 54
4+
const val patchVersion = 55
55
}

sdk/sdk-android/src/main/kotlin/org/matrix/rustcomponents/sdk/matrix_sdk_ffi.kt

Lines changed: 67 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2934,7 +2934,7 @@ internal interface UniffiLib : Library {
29342934
): Pointer
29352935
fun uniffi_matrix_sdk_ffi_fn_method_timeline_subscribe_to_back_pagination_status(`ptr`: Pointer,`listener`: Long,
29362936
): Long
2937-
fun uniffi_matrix_sdk_ffi_fn_method_timeline_toggle_reaction(`ptr`: Pointer,`uniqueId`: RustBuffer.ByValue,`key`: RustBuffer.ByValue,
2937+
fun uniffi_matrix_sdk_ffi_fn_method_timeline_toggle_reaction(`ptr`: Pointer,`itemId`: RustBuffer.ByValue,`key`: RustBuffer.ByValue,
29382938
): Long
29392939
fun uniffi_matrix_sdk_ffi_fn_method_timeline_unpin_event(`ptr`: Pointer,`eventId`: RustBuffer.ByValue,
29402940
): Long
@@ -4872,10 +4872,10 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
48724872
if (lib.uniffi_matrix_sdk_ffi_checksum_method_roommembersiterator_next_chunk() != 23186.toShort()) {
48734873
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
48744874
}
4875-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_sendattachmentjoinhandle_cancel() != 19759.toShort()) {
4875+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_sendattachmentjoinhandle_cancel() != 62384.toShort()) {
48764876
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
48774877
}
4878-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_sendattachmentjoinhandle_join() != 49985.toShort()) {
4878+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_sendattachmentjoinhandle_join() != 1903.toShort()) {
48794879
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
48804880
}
48814881
if (lib.uniffi_matrix_sdk_ffi_checksum_method_sendhandle_abort() != 11570.toShort()) {
@@ -5031,7 +5031,7 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
50315031
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_subscribe_to_back_pagination_status() != 46161.toShort()) {
50325032
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
50335033
}
5034-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_toggle_reaction() != 62959.toShort()) {
5034+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_toggle_reaction() != 29303.toShort()) {
50355035
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
50365036
}
50375037
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timeline_unpin_event() != 52414.toShort()) {
@@ -5085,7 +5085,7 @@ private fun uniffiCheckApiChecksums(lib: UniffiLib) {
50855085
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timelineitem_fmt_debug() != 38094.toShort()) {
50865086
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
50875087
}
5088-
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timelineitem_unique_id() != 30409.toShort()) {
5088+
if (lib.uniffi_matrix_sdk_ffi_checksum_method_timelineitem_unique_id() != 39945.toShort()) {
50895089
throw RuntimeException("UniFFI API checksum mismatch: try cleaning and rebuilding your project")
50905090
}
50915091
if (lib.uniffi_matrix_sdk_ffi_checksum_method_unreadnotificationscount_has_notifications() != 33024.toShort()) {
@@ -16612,8 +16612,18 @@ public object FfiConverterTypeRoomMessageEventContentWithoutRelation: FfiConvert
1661216612

1661316613
public interface SendAttachmentJoinHandleInterface {
1661416614

16615+
/**
16616+
* Cancel the current sending task.
16617+
*
16618+
* A subsequent call to [`Self::join`] will return immediately.
16619+
*/
1661516620
fun `cancel`()
1661616621

16622+
/**
16623+
* Wait until the attachment has been sent.
16624+
*
16625+
* If the sending had been cancelled, will return immediately.
16626+
*/
1661716627
suspend fun `join`()
1661816628

1661916629
companion object
@@ -16700,7 +16710,12 @@ open class SendAttachmentJoinHandle: Disposable, AutoCloseable, SendAttachmentJo
1670016710
}
1670116711
}
1670216712

16703-
override fun `cancel`()
16713+
16714+
/**
16715+
* Cancel the current sending task.
16716+
*
16717+
* A subsequent call to [`Self::join`] will return immediately.
16718+
*/override fun `cancel`()
1670416719
=
1670516720
callWithPointer {
1670616721
uniffiRustCall() { _status ->
@@ -16712,6 +16727,11 @@ open class SendAttachmentJoinHandle: Disposable, AutoCloseable, SendAttachmentJo
1671216727

1671316728

1671416729

16730+
/**
16731+
* Wait until the attachment has been sent.
16732+
*
16733+
* If the sending had been cancelled, will return immediately.
16734+
*/
1671516735
@Throws(RoomException::class)
1671616736
@Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
1671716737
override suspend fun `join`() {
@@ -19296,19 +19316,17 @@ public interface TimelineInterface {
1929619316
/**
1929719317
* Toggle a reaction on an event.
1929819318
*
19299-
* The `unique_id` parameter is a string returned by
19300-
* the `TimelineItem::unique_id()` method. As such, this method works both
19301-
* on local echoes and remote items.
19302-
*
1930319319
* Adds or redacts a reaction based on the state of the reaction at the
1930419320
* time it is called.
1930519321
*
19322+
* This method works both on local echoes and remote items.
19323+
*
1930619324
* When redacting a previous reaction, the redaction reason is not set.
1930719325
*
1930819326
* Ensures that only one reaction is sent at a time to avoid race
1930919327
* conditions and spamming the homeserver with requests.
1931019328
*/
19311-
suspend fun `toggleReaction`(`uniqueId`: kotlin.String, `key`: kotlin.String)
19329+
suspend fun `toggleReaction`(`itemId`: EventOrTransactionId, `key`: kotlin.String)
1931219330

1931319331
/**
1931419332
* Adds a new pinned event by sending an updated `m.room.pinned_events`
@@ -19985,26 +20003,24 @@ open class Timeline: Disposable, AutoCloseable, TimelineInterface {
1998520003
/**
1998620004
* Toggle a reaction on an event.
1998720005
*
19988-
* The `unique_id` parameter is a string returned by
19989-
* the `TimelineItem::unique_id()` method. As such, this method works both
19990-
* on local echoes and remote items.
19991-
*
1999220006
* Adds or redacts a reaction based on the state of the reaction at the
1999320007
* time it is called.
1999420008
*
20009+
* This method works both on local echoes and remote items.
20010+
*
1999520011
* When redacting a previous reaction, the redaction reason is not set.
1999620012
*
1999720013
* Ensures that only one reaction is sent at a time to avoid race
1999820014
* conditions and spamming the homeserver with requests.
1999920015
*/
2000020016
@Throws(ClientException::class)
2000120017
@Suppress("ASSIGNED_BUT_NEVER_ACCESSED_VARIABLE")
20002-
override suspend fun `toggleReaction`(`uniqueId`: kotlin.String, `key`: kotlin.String) {
20018+
override suspend fun `toggleReaction`(`itemId`: EventOrTransactionId, `key`: kotlin.String) {
2000320019
return uniffiRustCallAsync(
2000420020
callWithPointer { thisPtr ->
2000520021
UniffiLib.INSTANCE.uniffi_matrix_sdk_ffi_fn_method_timeline_toggle_reaction(
2000620022
thisPtr,
20007-
FfiConverterString.lower(`uniqueId`),FfiConverterString.lower(`key`),
20023+
FfiConverterTypeEventOrTransactionId.lower(`itemId`),FfiConverterString.lower(`key`),
2000820024
)
2000920025
},
2001020026
{ future, callback, continuation -> UniffiLib.INSTANCE.ffi_matrix_sdk_ffi_rust_future_poll_void(future, callback, continuation) },
@@ -21044,7 +21060,10 @@ public interface TimelineItemInterface {
2104421060

2104521061
fun `fmtDebug`(): kotlin.String
2104621062

21047-
fun `uniqueId`(): kotlin.String
21063+
/**
21064+
* An opaque unique identifier for this timeline item.
21065+
*/
21066+
fun `uniqueId`(): TimelineUniqueId
2104821067

2104921068
companion object
2105021069
}
@@ -21166,8 +21185,11 @@ open class TimelineItem: Disposable, AutoCloseable, TimelineItemInterface {
2116621185
}
2116721186

2116821187

21169-
override fun `uniqueId`(): kotlin.String {
21170-
return FfiConverterString.lift(
21188+
21189+
/**
21190+
* An opaque unique identifier for this timeline item.
21191+
*/override fun `uniqueId`(): TimelineUniqueId {
21192+
return FfiConverterTypeTimelineUniqueId.lift(
2117121193
callWithPointer {
2117221194
uniffiRustCall() { _status ->
2117321195
UniffiLib.INSTANCE.uniffi_matrix_sdk_ffi_fn_method_timelineitem_unique_id(
@@ -25016,6 +25038,31 @@ public object FfiConverterTypeThumbnailInfo: FfiConverterRustBuffer<ThumbnailInf
2501625038

2501725039

2501825040

25041+
data class TimelineUniqueId (
25042+
var `id`: kotlin.String
25043+
) {
25044+
25045+
companion object
25046+
}
25047+
25048+
public object FfiConverterTypeTimelineUniqueId: FfiConverterRustBuffer<TimelineUniqueId> {
25049+
override fun read(buf: ByteBuffer): TimelineUniqueId {
25050+
return TimelineUniqueId(
25051+
FfiConverterString.read(buf),
25052+
)
25053+
}
25054+
25055+
override fun allocationSize(value: TimelineUniqueId) = (
25056+
FfiConverterString.allocationSize(value.`id`)
25057+
)
25058+
25059+
override fun write(value: TimelineUniqueId, buf: ByteBuffer) {
25060+
FfiConverterString.write(value.`id`, buf)
25061+
}
25062+
}
25063+
25064+
25065+
2501925066
data class TracingConfiguration (
2502025067
/**
2502125068
* A filter line following the [RUST_LOG format].

0 commit comments

Comments
 (0)