letro/letro-ios
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases 2 Wiki Activity

Bump the RustSDK to v25.07.23

Browse Source
This commit is contained in:
Stefan Ceriu
2025-07-23 17:20:39 +03:00
committed by Stefan Ceriu
parent e5a0519a9f
commit b8a6763d11
6 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ElementX.xcodeproj/project.pbxproj
View File

@@ -9036,7 +9036,7 @@
repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift"; repositoryURL = "https://github.com/element-hq/matrix-rust-components-swift";
requirement = { requirement = {
kind = exactVersion; kind = exactVersion;
version = 25.07.15; version = 25.07.23;
}; };
}; };
701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = { 701C7BEF8F70F7A83E852DCC /* XCRemoteSwiftPackageReference "GZIP" */ = {

4
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View File

@@ -158,8 +158,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/element-hq/matrix-rust-components-swift", "location" : "https://github.com/element-hq/matrix-rust-components-swift",
"state" : { "state" : {
"revision" : "1c896dcca3bd302b492a71b3d020f50d8407fea0", "revision" : "4a9adc537b42360b525474b1122678cb3394817f",
"version" : "25.7.15" "version" : "25.7.23"
} }
}, },
{ {

10
ElementX/Sources/Mocks/Generated/SDKGeneratedMocks.swift
View File

@@ -2168,13 +2168,13 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
open var getUrlUrlReceivedUrl: String? open var getUrlUrlReceivedUrl: String?
open var getUrlUrlReceivedInvocations: [String] = [] open var getUrlUrlReceivedInvocations: [String] = []
var getUrlUrlUnderlyingReturnValue: String! var getUrlUrlUnderlyingReturnValue: Data!
open var getUrlUrlReturnValue: String! { open var getUrlUrlReturnValue: Data! {
get { get {
if Thread.isMainThread { if Thread.isMainThread {
return getUrlUrlUnderlyingReturnValue return getUrlUrlUnderlyingReturnValue
} else { } else {
var returnValue: String? = nil var returnValue: Data? = nil
DispatchQueue.main.sync { DispatchQueue.main.sync {
returnValue = getUrlUrlUnderlyingReturnValue returnValue = getUrlUrlUnderlyingReturnValue
} }
@@ -2192,9 +2192,9 @@ open class ClientSDKMock: MatrixRustSDK.Client, @unchecked Sendable {
} }
} }
} }
open var getUrlUrlClosure: ((String) async throws -> String)? open var getUrlUrlClosure: ((String) async throws -> Data)?
open override func getUrl(url: String) async throws -> String { open override func getUrl(url: String) async throws -> Data {
if let error = getUrlUrlThrowableError { if let error = getUrlUrlThrowableError {
throw error throw error
} }

5
ElementX/Sources/Mocks/SDK/ClientSDKMock.swift
View File

@@ -43,7 +43,7 @@ extension ClientSDKMock {
userIdServerNameThrowableError = MockError.generic userIdServerNameThrowableError = MockError.generic
serverReturnValue = "https://\(configuration.serverAddress)" serverReturnValue = "https://\(configuration.serverAddress)"
homeserverReturnValue = configuration.homeserverURL homeserverReturnValue = configuration.homeserverURL
urlForOidcOidcConfigurationPromptLoginHintDeviceIdReturnValue = OAuthAuthorizationDataSDKMock(configuration: configuration) urlForOidcOidcConfigurationPromptLoginHintDeviceIdAdditionalScopesReturnValue = OAuthAuthorizationDataSDKMock(configuration: configuration)
loginUsernamePasswordInitialDeviceNameDeviceIdClosure = { username, password, _, _ in loginUsernamePasswordInitialDeviceNameDeviceIdClosure = { username, password, _, _ in
guard username == configuration.validCredentials.username, guard username == configuration.validCredentials.username,
password == configuration.validCredentials.password else { password == configuration.validCredentials.password else {
@@ -56,7 +56,8 @@ extension ClientSDKMock {
getUrlUrlClosure = { url in getUrlUrlClosure = { url in
guard url.contains(".well-known/element/element.json") else { throw MockError.generic } guard url.contains(".well-known/element/element.json") else { throw MockError.generic }
if let elementWellKnown = configuration.elementWellKnown { if let elementWellKnown = configuration.elementWellKnown {
return elementWellKnown guard let data = elementWellKnown.data(using: .utf8) else { fatalError() }
return data
} else { } else {
throw MockError.generic throw MockError.generic
} }

6
ElementX/Sources/Services/Client/Client.swift
View File

@@ -21,11 +21,7 @@ extension ClientProtocol {
return .failure(.invalidServerName) return .failure(.invalidServerName)
} }
let response = try await getUrl(url: url.absoluteString) let data = try await getUrl(url: url.absoluteString)
guard let data = response.data(using: .utf8) else {
return .failure(.invalidResponse)
}
return .success(data) return .success(data)
} catch { } catch {

2
project.yml
View File

@@ -68,7 +68,7 @@ packages:
# Element/Matrix dependencies # Element/Matrix dependencies
MatrixRustSDK: MatrixRustSDK:
url: https://github.com/element-hq/matrix-rust-components-swift url: https://github.com/element-hq/matrix-rust-components-swift
exactVersion: 25.07.15 exactVersion: 25.07.23
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
Compound: Compound:
url: https://github.com/element-hq/compound-ios url: https://github.com/element-hq/compound-ios