ehealthsolutions/element-x-ios
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-ios.git synced 2026-11-04 19:44:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump SDK version and fix breaking changes. (#703)

Browse Source
This commit is contained in:
Doug
2023-03-15 12:42:19 +00:00
committed by GitHub
parent 0ae664933b
commit 266fccefbb
5 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
+2 -2
View File
@@ -95,8 +95,8 @@
"kind" : "remoteSourceControl", "kind" : "remoteSourceControl",
"location" : "https://github.com/matrix-org/matrix-rust-components-swift", "location" : "https://github.com/matrix-org/matrix-rust-components-swift",
"state" : { "state" : {
"revision" : "8d7ace5140d0f024b9a03939cdff29c837dc5645", "revision" : "6e9c8b7f0f68fd8e617e9d6c1ad902736899557a",
"version" : "1.0.45-alpha" "version" : "1.0.46-alpha"
} }
}, },
{ {
ElementX/Sources/Services/Media/MediaLoader.swift
+2 -2
View File
@@ -36,13 +36,13 @@ actor MediaLoader: MediaLoaderProtocol {
func loadMediaContentForSource(_ source: MediaSourceProxy) async throws -> Data { func loadMediaContentForSource(_ source: MediaSourceProxy) async throws -> Data {
try await enqueueLoadMediaRequest(forSource: source) { try await enqueueLoadMediaRequest(forSource: source) {
try self.client.getMediaContent(source: source.underlyingSource) try self.client.getMediaContent(mediaSource: source.underlyingSource)
} }
} }
func loadMediaThumbnailForSource(_ source: MediaSourceProxy, width: UInt, height: UInt) async throws -> Data { func loadMediaThumbnailForSource(_ source: MediaSourceProxy, width: UInt, height: UInt) async throws -> Data {
try await enqueueLoadMediaRequest(forSource: source) { try await enqueueLoadMediaRequest(forSource: source) {
try self.client.getMediaThumbnail(source: source.underlyingSource, width: UInt64(width), height: UInt64(height)) try self.client.getMediaThumbnail(mediaSource: source.underlyingSource, width: UInt64(width), height: UInt64(height))
} }
} }
UnitTests/Sources/MediaProvider/MediaLoaderTests.swift
+17 -3
View File
@@ -57,12 +57,12 @@ final class MediaLoaderTests: XCTestCase {
private class MockMediaLoadingClient: ClientProtocol { private class MockMediaLoadingClient: ClientProtocol {
private(set) var numberOfInvocations = 0 private(set) var numberOfInvocations = 0
func getMediaContent(source: MatrixRustSDK.MediaSource) throws -> [UInt8] { func getMediaContent(mediaSource: MatrixRustSDK.MediaSource) throws -> [UInt8] {
numberOfInvocations += 1 numberOfInvocations += 1
return [] return []
} }
func getMediaThumbnail(source: MatrixRustSDK.MediaSource, width: UInt64, height: UInt64) throws -> [UInt8] { func getMediaThumbnail(mediaSource: MatrixRustSDK.MediaSource, width: UInt64, height: UInt64) throws -> [UInt8] {
numberOfInvocations += 1 numberOfInvocations += 1
return [] return []
} }
@@ -93,7 +93,9 @@ private class MockMediaLoadingClient: ClientProtocol {
func setAccountData(eventType: String, content: String) throws { fatalError() } func setAccountData(eventType: String, content: String) throws { fatalError() }
func uploadMedia(mimeType: String, content: [UInt8]) throws -> String { fatalError() } func uploadMedia(mimeType: String, data content: [UInt8]) throws -> String { fatalError() }
func getMediaFile(source: MatrixRustSDK.MediaSource, mimeType: String) throws -> MatrixRustSDK.MediaFileHandle { fatalError() }
func getSessionVerificationController() throws -> MatrixRustSDK.SessionVerificationController { fatalError() } func getSessionVerificationController() throws -> MatrixRustSDK.SessionVerificationController { fatalError() }
@@ -114,4 +116,16 @@ private class MockMediaLoadingClient: ClientProtocol {
func slidingSync() -> MatrixRustSDK.SlidingSyncBuilder { fatalError() } func slidingSync() -> MatrixRustSDK.SlidingSyncBuilder { fatalError() }
func startSync(timelineLimit: UInt16?) { } func startSync(timelineLimit: UInt16?) { }
func createRoom(request: MatrixRustSDK.CreateRoomParameters) throws -> String { fatalError() }
// swiftlint:disable:next function_parameter_count
func setPusher(identifiers: MatrixRustSDK.PusherIdentifiers,
kind: MatrixRustSDK.PusherKind,
appDisplayName: String,
deviceDisplayName: String,
profileTag: String?,
lang: String) throws {
fatalError()
}
} }
changelog.d/pr-703.change
+1
View File
@@ -0,0 +1 @@
Bump the SDK version and fix breaking changes.
project.yml
+1 -1
View File
@@ -40,7 +40,7 @@ include:
packages: packages:
MatrixRustSDK: MatrixRustSDK:
url: https://github.com/matrix-org/matrix-rust-components-swift url: https://github.com/matrix-org/matrix-rust-components-swift
exactVersion: 1.0.45-alpha exactVersion: 1.0.46-alpha
# path: ../matrix-rust-sdk # path: ../matrix-rust-sdk
DesignKit: DesignKit:
path: DesignKit path: DesignKit