mirror of
https://github.com/Novaloop-AG/element-x-ios.git
synced 2026-11-03 06:55:59 +00:00
Swift 6 Migration (#5733)
* Enable Swift 6.2 with default main actor isolation for the app target Turn on SWIFT_VERSION 6.2, SWIFT_APPROACHABLE_CONCURRENCY and SWIFT_DEFAULT_ACTOR_ISOLATION = MainActor for the ElementX target, matching the NSE and Share Extension (which already use 6.2 without the main actor default). # Conflicts: # ElementX.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved * Update the code generation templates for Swift 6 Emit nonisolated/@unchecked Sendable mocks and nonisolated string enums, and mark async mock methods @concurrent so they keep suspending like the real implementations (otherwise intermediate states are unobservable in tests). Includes the regenerated mocks and strings. # Conflicts: # ElementX/Sources/Mocks/Generated/GeneratedMocks.swift * Make the data layer and services nonisolated and Sendable Annotate the value-type models, Rust SDK proxy wrappers, timeline item graph, settings, logging and NSE-shared types as nonisolated, and conform the service protocols to Sendable so their existentials can cross isolation boundaries. These types run off the main actor and no longer inherit the target's default main actor isolation. * Adopt the new isolation across call sites, mocks and signatures Update call sites, closure signatures and mock configuration helpers to match the nonisolated/Sendable data layer, including the main actor isolated mock inits and the @Sendable filter on recentlyVisitedRooms. ^ Conflicts: ^ ElementX/Sources/Services/SecureBackup/SecureBackupController.swift * Remove redundant @MainActor annotations With the app target defaulting to main actor isolation, the explicit @MainActor on view models, coordinators, views and their protocols is no longer required. * Fix concurrency hotspots surfaced by the migration Resolve the room summary main-thread deadlock by moving diff processing onto AsyncStreams, add the SDKListener.onMainActor FIFO bridge for SDK callbacks, hop KVO/timer/UIKit callbacks to the main actor via assumeIsolated, add isolated deinits, and apply the few justified nonisolated(unsafe) escapes for queue-confined Apple APIs. * Fix the unit tests for Swift 6 concurrency Hop the waitForConfirmation body onto the caller's actor (Swift Testing runs confirmation closures off-actor), and adjust the affected suites and async signatures. * offload diffs on concurrent threads instead of main actor * make room info protocols sendable * use a task group for fetching data so that everything runs concurrently in the TextRoomTimelineView when getting the preview. * use the generic onMainActor implementation, which already makes a stream and send the continuation on the main actor. * small pr comments issues being addressed * update enterprise * Update StaticCode to 1.1.0 and specify the required Swift isolation. * fix ElementCallServiceTests * update enterprise * re-generate mocks * update enterprise * enterprise new code conformed to swift 6 --------- Co-authored-by: Doug <douglase@element.io>
This commit is contained in:
@@ -114,8 +114,10 @@ func waitForConfirmation<R>(_ comment: Comment? = nil,
|
||||
expectedCount: expectedCount,
|
||||
isolation: isolation,
|
||||
sourceLocation: sourceLocation) { confirmation in
|
||||
let result = try body(.init(continuation: continuation,
|
||||
expectedCount: expectedCount))
|
||||
let result = try await runBody(on: isolation,
|
||||
body,
|
||||
with: .init(continuation: continuation,
|
||||
expectedCount: expectedCount))
|
||||
for await _ in stream {
|
||||
confirmation()
|
||||
}
|
||||
@@ -123,6 +125,17 @@ func waitForConfirmation<R>(_ comment: Comment? = nil,
|
||||
}
|
||||
}
|
||||
|
||||
/// Runs the body on the given actor, so that it can safely touch the caller's isolated state.
|
||||
///
|
||||
/// Swift Testing's `confirmation` runs its closure on the concurrent executor regardless of the
|
||||
/// isolation parameter, so without this hop a body that synchronously triggers main actor
|
||||
/// work (e.g. sending a view action) would crash on the runtime's executor check.
|
||||
private func runBody<R>(on isolation: isolated (any Actor)?,
|
||||
_ body: (WaitingConfirmation) throws -> R,
|
||||
with confirmation: WaitingConfirmation) rethrows -> R {
|
||||
try body(confirmation)
|
||||
}
|
||||
|
||||
/// Waits for a confirmation to be triggered an expected number of times within a synchronous body,
|
||||
/// with a timeout.
|
||||
///
|
||||
@@ -181,8 +194,10 @@ func waitForConfirmation<R>(_ comment: Comment? = nil,
|
||||
expectedCount: expectedCount,
|
||||
isolation: isolation,
|
||||
sourceLocation: sourceLocation) { confirmation in
|
||||
let result = try body(.init(continuation: continuation,
|
||||
expectedCount: expectedCount))
|
||||
let result = try await runBody(on: isolation,
|
||||
body,
|
||||
with: .init(continuation: continuation,
|
||||
expectedCount: expectedCount))
|
||||
|
||||
// The reason why I don't add to the task group directly the non timeout implementation
|
||||
// is that I do not want the body to be marked as @escaping and thus to be able to capture
|
||||
|
||||
Reference in New Issue
Block a user