Skip to content

Commit 422d7be

Browse files
committed
Bump to version 25.02.17 (matrix-rust-sdk/main 629421214fa4ab77b08e415e1b68dceb84e01e85)
1 parent cc010fc commit 422d7be

File tree

3 files changed

+22
-47
lines changed

3 files changed

+22
-47
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 = "4d05263bbda4e61060454186a12a4e7a56bb40f53be2ba7e3cdb5a5ba7163b10"
5-
let version = "25.02.11"
4+
let checksum = "4101cc86764d7cdfebbb34ff5abf25ebf39bc0cf4f272d8f79f53f6a1fd7ed7f"
5+
let version = "25.02.17"
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.swift

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -914,9 +914,10 @@ public enum QrCodeLoginError {
914914

915915

916916
/**
917-
* An error happened while we were communicating with the OIDC provider.
917+
* An error happened while we were communicating with the OAuth 2.0
918+
* authorization server.
918919
*/
919-
case Oidc(message: String)
920+
case Oauth(message: String)
920921

921922
/**
922923
* The other device has signaled to us that the login has failed.
@@ -940,7 +941,8 @@ public enum QrCodeLoginError {
940941

941942
/**
942943
* An error happened while we were trying to discover our user and device
943-
* ID, after we have acquired an access token from the OIDC provider.
944+
* ID, after we have acquired an access token from the OAuth 2.0
945+
* authorization server.
944946
*/
945947
case UserIdDiscovery(message: String)
946948

@@ -974,7 +976,7 @@ public struct FfiConverterTypeQRCodeLoginError: FfiConverterRustBuffer {
974976

975977

976978

977-
case 1: return .Oidc(
979+
case 1: return .Oauth(
978980
message: try FfiConverterString.read(from: &buf)
979981
)
980982

@@ -1021,7 +1023,7 @@ public struct FfiConverterTypeQRCodeLoginError: FfiConverterRustBuffer {
10211023

10221024

10231025

1024-
case .Oidc(_ /* message is ignored*/):
1026+
case .Oauth(_ /* message is ignored*/):
10251027
writeInt(&buf, Int32(1))
10261028
case .LoginFailure(_ /* message is ignored*/):
10271029
writeInt(&buf, Int32(2))

Sources/MatrixRustSDK/matrix_sdk_ffi.swift

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -2151,8 +2151,8 @@ public protocol ClientBuilderProtocol : AnyObject {
21512151
*
21522152
* This method will build the client and immediately attempt to log the
21532153
* client in using the provided [`QrCodeData`] using the login
2154-
* mechanism described in [MSC4108]. As such this methods requires OIDC
2155-
* support as well as sliding sync support.
2154+
* mechanism described in [MSC4108]. As such this methods requires OAuth
2155+
* 2.0 support as well as sliding sync support.
21562156
*
21572157
* The usage of the progress_listener is required to transfer the
21582158
* [`CheckCode`] to the existing client.
@@ -2349,8 +2349,8 @@ open func build()async throws -> Client {
23492349
*
23502350
* This method will build the client and immediately attempt to log the
23512351
* client in using the provided [`QrCodeData`] using the login
2352-
* mechanism described in [MSC4108]. As such this methods requires OIDC
2353-
* support as well as sliding sync support.
2352+
* mechanism described in [MSC4108]. As such this methods requires OAuth
2353+
* 2.0 support as well as sliding sync support.
23542354
*
23552355
* The usage of the progress_listener is required to transfer the
23562356
* [`CheckCode`] to the existing client.
@@ -23451,8 +23451,8 @@ public enum QrLoginProgress {
2345123451
*/checkCodeString: String
2345223452
)
2345323453
/**
23454-
* We are waiting for the login and for the OIDC provider to give us an
23455-
* access token.
23454+
* We are waiting for the login and for the OAuth 2.0 authorization server
23455+
* to give us an access token.
2345623456
*/
2345723457
case waitingForToken(userCode: String
2345823458
)
@@ -25565,8 +25565,6 @@ extension ShieldState: Equatable, Hashable {}
2556525565
public enum SlidingSyncVersion {
2556625566

2556725567
case none
25568-
case proxy(url: String
25569-
)
2557025568
case native
2557125569
}
2557225570

@@ -25580,10 +25578,7 @@ public struct FfiConverterTypeSlidingSyncVersion: FfiConverterRustBuffer {
2558025578

2558125579
case 1: return .none
2558225580

25583-
case 2: return .proxy(url: try FfiConverterString.read(from: &buf)
25584-
)
25585-
25586-
case 3: return .native
25581+
case 2: return .native
2558725582

2558825583
default: throw UniffiInternalError.unexpectedEnumCase
2558925584
}
@@ -25597,13 +25592,8 @@ public struct FfiConverterTypeSlidingSyncVersion: FfiConverterRustBuffer {
2559725592
writeInt(&buf, Int32(1))
2559825593

2559925594

25600-
case let .proxy(url):
25601-
writeInt(&buf, Int32(2))
25602-
FfiConverterString.write(url, into: &buf)
25603-
25604-
2560525595
case .native:
25606-
writeInt(&buf, Int32(3))
25596+
writeInt(&buf, Int32(2))
2560725597

2560825598
}
2560925599
}
@@ -25630,10 +25620,7 @@ extension SlidingSyncVersion: Equatable, Hashable {}
2563025620
public enum SlidingSyncVersionBuilder {
2563125621

2563225622
case none
25633-
case proxy(url: String
25634-
)
2563525623
case native
25636-
case discoverProxy
2563725624
case discoverNative
2563825625
}
2563925626

@@ -25647,14 +25634,9 @@ public struct FfiConverterTypeSlidingSyncVersionBuilder: FfiConverterRustBuffer
2564725634

2564825635
case 1: return .none
2564925636

25650-
case 2: return .proxy(url: try FfiConverterString.read(from: &buf)
25651-
)
25652-
25653-
case 3: return .native
25637+
case 2: return .native
2565425638

25655-
case 4: return .discoverProxy
25656-
25657-
case 5: return .discoverNative
25639+
case 3: return .discoverNative
2565825640

2565925641
default: throw UniffiInternalError.unexpectedEnumCase
2566025642
}
@@ -25668,21 +25650,12 @@ public struct FfiConverterTypeSlidingSyncVersionBuilder: FfiConverterRustBuffer
2566825650
writeInt(&buf, Int32(1))
2566925651

2567025652

25671-
case let .proxy(url):
25672-
writeInt(&buf, Int32(2))
25673-
FfiConverterString.write(url, into: &buf)
25674-
25675-
2567625653
case .native:
25677-
writeInt(&buf, Int32(3))
25678-
25679-
25680-
case .discoverProxy:
25681-
writeInt(&buf, Int32(4))
25654+
writeInt(&buf, Int32(2))
2568225655

2568325656

2568425657
case .discoverNative:
25685-
writeInt(&buf, Int32(5))
25658+
writeInt(&buf, Int32(3))
2568625659

2568725660
}
2568825661
}
@@ -32214,7 +32187,7 @@ private var initializationResult: InitializationResult = {
3221432187
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_build() != 56018) {
3221532188
return InitializationResult.apiChecksumMismatch
3221632189
}
32217-
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_build_with_qr_code() != 51905) {
32190+
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_build_with_qr_code() != 42452) {
3221832191
return InitializationResult.apiChecksumMismatch
3221932192
}
3222032193
if (uniffi_matrix_sdk_ffi_checksum_method_clientbuilder_cross_process_store_locks_holder_name() != 46627) {

0 commit comments

Comments
 (0)