Skip to content

Commit d5556ad

Browse files
committed
Bump to version 25.02.25 (matrix-rust-sdk/main 5dd5710758cbbe231765e46df738e5b21b7e730f)
1 parent 422d7be commit d5556ad

File tree

2 files changed

+41
-16
lines changed

2 files changed

+41
-16
lines changed

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// swift-tools-version:5.9
22
// The swift-tools-version declares the minimum version of Swift required to build this package.
33
import PackageDescription
4-
let checksum = "4101cc86764d7cdfebbb34ff5abf25ebf39bc0cf4f272d8f79f53f6a1fd7ed7f"
5-
let version = "25.02.17"
4+
let checksum = "49f4a26e82d988e7c42b8b87ddcf1fc95ddff66f71e4e721147a77c3c30b3bed"
5+
let version = "25.02.25"
66
let url = "https://github.com/element-hq/matrix-rust-components-swift/releases/download/\(version)/MatrixSDKFFI.xcframework.zip"
77
let package = Package(
88
name: "MatrixRustSDK",

Sources/MatrixRustSDK/matrix_sdk_ffi.swift

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -776,11 +776,9 @@ public protocol ClientProtocol : AnyObject {
776776
func loginWithOidcCallback(authorizationData: OidcAuthorizationData, callbackUrl: String) async throws
777777

778778
/**
779-
* Log out the current user. This method returns an optional URL that
780-
* should be presented to the user to complete logout (in the case of
781-
* Session having been authenticated using OIDC).
779+
* Log the current user out.
782780
*/
783-
func logout() async throws -> String?
781+
func logout() async throws
784782

785783
func notificationClient(processSetup: NotificationProcessSetup) async throws -> NotificationClient
786784

@@ -1643,11 +1641,9 @@ open func loginWithOidcCallback(authorizationData: OidcAuthorizationData, callba
16431641
}
16441642

16451643
/**
1646-
* Log out the current user. This method returns an optional URL that
1647-
* should be presented to the user to complete logout (in the case of
1648-
* Session having been authenticated using OIDC).
1644+
* Log the current user out.
16491645
*/
1650-
open func logout()async throws -> String? {
1646+
open func logout()async throws {
16511647
return
16521648
try await uniffiRustCallAsync(
16531649
rustFutureFunc: {
@@ -1656,10 +1652,10 @@ open func logout()async throws -> String? {
16561652

16571653
)
16581654
},
1659-
pollFunc: ffi_matrix_sdk_ffi_rust_future_poll_rust_buffer,
1660-
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_rust_buffer,
1661-
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_rust_buffer,
1662-
liftFunc: FfiConverterOptionString.lift,
1655+
pollFunc: ffi_matrix_sdk_ffi_rust_future_poll_void,
1656+
completeFunc: ffi_matrix_sdk_ffi_rust_future_complete_void,
1657+
freeFunc: ffi_matrix_sdk_ffi_rust_future_free_void,
1658+
liftFunc: { $0 },
16631659
errorHandler: FfiConverterTypeClientError.lift
16641660
)
16651661
}
@@ -12641,11 +12637,12 @@ public struct CreateRoomParameters {
1264112637
public var avatar: String?
1264212638
public var powerLevelContentOverride: PowerLevels?
1264312639
public var joinRuleOverride: JoinRule?
12640+
public var historyVisibilityOverride: RoomHistoryVisibility?
1264412641
public var canonicalAlias: String?
1264512642

1264612643
// Default memberwise initializers are never public by default, so we
1264712644
// declare one manually.
12648-
public init(name: String?, topic: String? = nil, isEncrypted: Bool, isDirect: Bool = false, visibility: RoomVisibility, preset: RoomPreset, invite: [String]? = nil, avatar: String? = nil, powerLevelContentOverride: PowerLevels? = nil, joinRuleOverride: JoinRule? = nil, canonicalAlias: String? = nil) {
12645+
public init(name: String?, topic: String? = nil, isEncrypted: Bool, isDirect: Bool = false, visibility: RoomVisibility, preset: RoomPreset, invite: [String]? = nil, avatar: String? = nil, powerLevelContentOverride: PowerLevels? = nil, joinRuleOverride: JoinRule? = nil, historyVisibilityOverride: RoomHistoryVisibility? = nil, canonicalAlias: String? = nil) {
1264912646
self.name = name
1265012647
self.topic = topic
1265112648
self.isEncrypted = isEncrypted
@@ -12656,6 +12653,7 @@ public struct CreateRoomParameters {
1265612653
self.avatar = avatar
1265712654
self.powerLevelContentOverride = powerLevelContentOverride
1265812655
self.joinRuleOverride = joinRuleOverride
12656+
self.historyVisibilityOverride = historyVisibilityOverride
1265912657
self.canonicalAlias = canonicalAlias
1266012658
}
1266112659
}
@@ -12694,6 +12692,9 @@ extension CreateRoomParameters: Equatable, Hashable {
1269412692
if lhs.joinRuleOverride != rhs.joinRuleOverride {
1269512693
return false
1269612694
}
12695+
if lhs.historyVisibilityOverride != rhs.historyVisibilityOverride {
12696+
return false
12697+
}
1269712698
if lhs.canonicalAlias != rhs.canonicalAlias {
1269812699
return false
1269912700
}
@@ -12711,6 +12712,7 @@ extension CreateRoomParameters: Equatable, Hashable {
1271112712
hasher.combine(avatar)
1271212713
hasher.combine(powerLevelContentOverride)
1271312714
hasher.combine(joinRuleOverride)
12715+
hasher.combine(historyVisibilityOverride)
1271412716
hasher.combine(canonicalAlias)
1271512717
}
1271612718
}
@@ -12730,6 +12732,7 @@ public struct FfiConverterTypeCreateRoomParameters: FfiConverterRustBuffer {
1273012732
avatar: FfiConverterOptionString.read(from: &buf),
1273112733
powerLevelContentOverride: FfiConverterOptionTypePowerLevels.read(from: &buf),
1273212734
joinRuleOverride: FfiConverterOptionTypeJoinRule.read(from: &buf),
12735+
historyVisibilityOverride: FfiConverterOptionTypeRoomHistoryVisibility.read(from: &buf),
1273312736
canonicalAlias: FfiConverterOptionString.read(from: &buf)
1273412737
)
1273512738
}
@@ -12745,6 +12748,7 @@ public struct FfiConverterTypeCreateRoomParameters: FfiConverterRustBuffer {
1274512748
FfiConverterOptionString.write(value.avatar, into: &buf)
1274612749
FfiConverterOptionTypePowerLevels.write(value.powerLevelContentOverride, into: &buf)
1274712750
FfiConverterOptionTypeJoinRule.write(value.joinRuleOverride, into: &buf)
12751+
FfiConverterOptionTypeRoomHistoryVisibility.write(value.historyVisibilityOverride, into: &buf)
1274812752
FfiConverterOptionString.write(value.canonicalAlias, into: &buf)
1274912753
}
1275012754
}
@@ -30456,6 +30460,27 @@ fileprivate struct FfiConverterOptionTypePushFormat: FfiConverterRustBuffer {
3045630460
}
3045730461
}
3045830462

30463+
fileprivate struct FfiConverterOptionTypeRoomHistoryVisibility: FfiConverterRustBuffer {
30464+
typealias SwiftType = RoomHistoryVisibility?
30465+
30466+
public static func write(_ value: SwiftType, into buf: inout [UInt8]) {
30467+
guard let value = value else {
30468+
writeInt(&buf, Int8(0))
30469+
return
30470+
}
30471+
writeInt(&buf, Int8(1))
30472+
FfiConverterTypeRoomHistoryVisibility.write(value, into: &buf)
30473+
}
30474+
30475+
public static func read(from buf: inout (data: Data, offset: Data.Index)) throws -> SwiftType {
30476+
switch try readInt(&buf) as Int8 {
30477+
case 0: return nil
30478+
case 1: return try FfiConverterTypeRoomHistoryVisibility.read(from: &buf)
30479+
default: throw UniffiInternalError.unexpectedOptionalTag
30480+
}
30481+
}
30482+
}
30483+
3045930484
fileprivate struct FfiConverterOptionTypeRoomNotificationMode: FfiConverterRustBuffer {
3046030485
typealias SwiftType = RoomNotificationMode?
3046130486

@@ -32088,7 +32113,7 @@ private var initializationResult: InitializationResult = {
3208832113
if (uniffi_matrix_sdk_ffi_checksum_method_client_login_with_oidc_callback() != 35005) {
3208932114
return InitializationResult.apiChecksumMismatch
3209032115
}
32091-
if (uniffi_matrix_sdk_ffi_checksum_method_client_logout() != 7576) {
32116+
if (uniffi_matrix_sdk_ffi_checksum_method_client_logout() != 42911) {
3209232117
return InitializationResult.apiChecksumMismatch
3209332118
}
3209432119
if (uniffi_matrix_sdk_ffi_checksum_method_client_notification_client() != 37308) {

0 commit comments

Comments
 (0)