Skip to content

Commit 7221258

Browse files
mapostolakismapostolakis
authored
Merge pull request #87 from essentialdevelopercom/swift-concurrency
Enable 'Complete' Strict Swift Concurrency Checking
2 parents f8e1020 + 68372cc commit 7221258

File tree

52 files changed

+402
-376
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+402
-376
lines changed

‎EssentialApp/EssentialApp.xcodeproj/project.pbxproj‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,8 @@
508508
SUPPORTS_MACCATALYST = NO;
509509
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
510510
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
511+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
512+
SWIFT_STRICT_CONCURRENCY = complete;
511513
SWIFT_VERSION = 5.0;
512514
TARGETED_DEVICE_FAMILY = 1;
513515
};
@@ -532,6 +534,8 @@
532534
SUPPORTS_MACCATALYST = NO;
533535
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
534536
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
537+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
538+
SWIFT_STRICT_CONCURRENCY = complete;
535539
SWIFT_VERSION = 5.0;
536540
TARGETED_DEVICE_FAMILY = 1;
537541
};
@@ -556,7 +560,9 @@
556560
SUPPORTS_MACCATALYST = NO;
557561
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
558562
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
563+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
559564
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
565+
SWIFT_STRICT_CONCURRENCY = complete;
560566
SWIFT_VERSION = 5.0;
561567
TARGETED_DEVICE_FAMILY = 1;
562568
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EssentialApp.app/EssentialApp";
@@ -582,6 +588,8 @@
582588
SUPPORTS_MACCATALYST = NO;
583589
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
584590
SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
591+
SWIFT_APPROACHABLE_CONCURRENCY = YES;
592+
SWIFT_STRICT_CONCURRENCY = complete;
585593
SWIFT_VERSION = 5.0;
586594
TARGETED_DEVICE_FAMILY = 1;
587595
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EssentialApp.app/EssentialApp";

‎EssentialApp/EssentialApp/CombineHelpers.swift‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,10 @@ public extension HTTPClient {
4040

4141
return Deferred {
4242
Future { completion in
43-
task = self.get(from: url, completion: completion)
43+
nonisolated(unsafe) let uncheckedCompletion = completion
44+
task = self.get(from: url, completion: {
45+
uncheckedCompletion($0)
46+
})
4447
}
4548
}
4649
.handleEvents(receiveCancel: { task?.cancel() })
@@ -229,7 +232,8 @@ extension AnyDispatchQueueScheduler {
229232
if store.contextQueue == .main, Thread.isMainThread {
230233
action()
231234
} else {
232-
store.perform(action)
235+
nonisolated(unsafe) let uncheckedAction = action
236+
store.perform { uncheckedAction() }
233237
}
234238
return AnyCancellable {}
235239
}
@@ -238,15 +242,17 @@ extension AnyDispatchQueueScheduler {
238242
if store.contextQueue == .main, Thread.isMainThread {
239243
action()
240244
} else {
241-
store.perform(action)
245+
nonisolated(unsafe) let uncheckedAction = action
246+
store.perform { uncheckedAction() }
242247
}
243248
}
244249

245250
func schedule(options: DispatchQueue.SchedulerOptions?, _ action: @escaping () -> Void) {
246251
if store.contextQueue == .main, Thread.isMainThread {
247252
action()
248253
} else {
249-
store.perform(action)
254+
nonisolated(unsafe) let uncheckedAction = action
255+
store.perform { uncheckedAction() }
250256
}
251257
}
252258
}

‎EssentialApp/EssentialApp/CommentsUIComposer.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import Combine
77
import EssentialFeed
88
import EssentialFeediOS
99

10+
@MainActor
1011
public final class CommentsUIComposer {
1112
private init() {}
1213

@@ -38,6 +39,7 @@ public final class CommentsUIComposer {
3839
}
3940
}
4041

42+
@MainActor
4143
final class CommentsViewAdapter: ResourceView {
4244
private weak var controller: ListViewController?
4345

‎EssentialApp/EssentialApp/FeedUIComposer.swift‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ import Combine
77
import EssentialFeed
88
import EssentialFeediOS
99

10+
@MainActor
1011
public final class FeedUIComposer {
1112
private init() {}
1213

1314
private typealias FeedPresentationAdapter = LoadResourcePresentationAdapter<Paginated<FeedImage>, FeedViewAdapter>
1415

1516
public static func feedComposedWith(
16-
feedLoader: @escaping () -> AnyPublisher<Paginated<FeedImage>, Error>,
17-
imageLoader: @escaping (URL) -> FeedImageDataLoader.Publisher,
18-
selection: @escaping (FeedImage) -> Void = { _ in }
17+
feedLoader: @MainActor @escaping () -> AnyPublisher<Paginated<FeedImage>, Error>,
18+
imageLoader: @MainActor @escaping (URL) -> FeedImageDataLoader.Publisher,
19+
selection: @MainActor @escaping (FeedImage) -> Void = { _ in }
1920
) -> ListViewController {
2021
let presentationAdapter = FeedPresentationAdapter(loader: feedLoader)
2122

‎EssentialApp/EssentialApp/FeedViewAdapter.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import UIKit
66
import EssentialFeed
77
import EssentialFeediOS
88

9+
@MainActor
910
final class FeedViewAdapter: ResourceView {
1011
private weak var controller: ListViewController?
1112
private let imageLoader: (URL) -> FeedImageDataLoader.Publisher

‎EssentialApp/EssentialApp/LoadResourcePresentationAdapter.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import Combine
66
import EssentialFeed
77
import EssentialFeediOS
88

9+
@MainActor
910
final class LoadResourcePresentationAdapter<Resource, View: ResourceView> {
1011
private let loader: () -> AnyPublisher<Resource, Error>
1112
private var cancellable: Cancellable?

‎EssentialApp/EssentialAppTests/CommentsUIIntegrationTests.swift‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import EssentialApp
99
import EssentialFeed
1010
import EssentialFeediOS
1111

12+
@MainActor
1213
class CommentsUIIntegrationTests: XCTestCase {
1314

1415
func test_commentsView_hasTitle() {
@@ -107,18 +108,6 @@ class CommentsUIIntegrationTests: XCTestCase {
107108
assertThat(sut, isRendering: [comment])
108109
}
109110

110-
func test_loadCommentsCompletion_dispatchesFromBackgroundToMainThread() {
111-
let (sut, loader) = makeSUT()
112-
sut.simulateAppearance()
113-
114-
let exp = expectation(description: "Wait for background queue")
115-
DispatchQueue.global().async {
116-
loader.completeCommentsLoading(at: 0)
117-
exp.fulfill()
118-
}
119-
wait(for: [exp], timeout: 1.0)
120-
}
121-
122111
func test_loadCommentsCompletion_rendersErrorMessageOnErrorUntilNextReload() {
123112
let (sut, loader) = makeSUT()
124113

‎EssentialApp/EssentialAppTests/FeedAcceptanceTests.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import EssentialFeed
77
import EssentialFeediOS
88
@testable import EssentialApp
99

10+
@MainActor
1011
class FeedAcceptanceTests: XCTestCase {
1112

1213
func test_onLaunch_displaysRemoteFeedWhenCustomerHasConnectivity() throws {
@@ -183,6 +184,7 @@ class FeedAcceptanceTests: XCTestCase {
183184

184185
}
185186

187+
@MainActor
186188
extension CoreDataFeedStore {
187189
static var empty: CoreDataFeedStore {
188190
get throws {

‎EssentialApp/EssentialAppTests/FeedUIIntegrationTests.swift‎

Lines changed: 2 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import EssentialApp
88
import EssentialFeed
99
import EssentialFeediOS
1010

11+
@MainActor
1112
class FeedUIIntegrationTests: XCTestCase {
1213

1314
func test_feedView_hasTitle() {
@@ -137,18 +138,6 @@ class FeedUIIntegrationTests: XCTestCase {
137138
assertThat(sut, isRendering: [image0])
138139
}
139140

140-
func test_loadFeedCompletion_dispatchesFromBackgroundToMainThread() {
141-
let (sut, loader) = makeSUT()
142-
sut.simulateAppearance()
143-
144-
let exp = expectation(description: "Wait for background queue")
145-
DispatchQueue.global().async {
146-
loader.completeFeedLoading(at: 0)
147-
exp.fulfill()
148-
}
149-
wait(for: [exp], timeout: 1.0)
150-
}
151-
152141
func test_loadFeedCompletion_rendersErrorMessageOnErrorUntilNextReload() {
153142
let (sut, loader) = makeSUT()
154143

@@ -225,20 +214,6 @@ class FeedUIIntegrationTests: XCTestCase {
225214
XCTAssertFalse(sut.isShowingLoadMoreFeedIndicator, "Expected no loading indicator once user initiated loading completes with error")
226215
}
227216

228-
func test_loadMoreCompletion_dispatchesFromBackgroundToMainThread() {
229-
let (sut, loader) = makeSUT()
230-
sut.simulateAppearance()
231-
loader.completeFeedLoading(at: 0)
232-
sut.simulateLoadMoreFeedAction()
233-
234-
let exp = expectation(description: "Wait for background queue")
235-
DispatchQueue.global().async {
236-
loader.completeLoadMore()
237-
exp.fulfill()
238-
}
239-
wait(for: [exp], timeout: 1.0)
240-
}
241-
242217
func test_loadMoreCompletion_rendersErrorMessageOnError() {
243218
let (sut, loader) = makeSUT()
244219
sut.simulateAppearance()
@@ -545,21 +520,6 @@ class FeedUIIntegrationTests: XCTestCase {
545520
XCTAssertNil(view?.renderedImage, "Expected no rendered image when an image load finishes after the view is not visible anymore")
546521
}
547522

548-
func test_loadImageDataCompletion_dispatchesFromBackgroundToMainThread() {
549-
let (sut, loader) = makeSUT()
550-
551-
sut.simulateAppearance()
552-
loader.completeFeedLoading(with: [makeImage()])
553-
_ = sut.simulateFeedImageViewVisible(at: 0)
554-
555-
let exp = expectation(description: "Wait for background queue")
556-
DispatchQueue.global().async {
557-
loader.completeImageLoading(with: self.anyImageData(), at: 0)
558-
exp.fulfill()
559-
}
560-
wait(for: [exp], timeout: 1.0)
561-
}
562-
563523
func test_feedImageView_doesNotLoadImageAgainUntilPreviousRequestCompletes() {
564524
let image = makeImage(url: URL(string: "http://url-0.com")!)
565525
let (sut, loader) = makeSUT()
@@ -589,7 +549,7 @@ class FeedUIIntegrationTests: XCTestCase {
589549
// MARK: - Helpers
590550

591551
private func makeSUT(
592-
selection: @escaping (FeedImage) -> Void = { _ in },
552+
selection: @MainActor @escaping (FeedImage) -> Void = { _ in },
593553
file: StaticString = #filePath,
594554
line: UInt = #line
595555
) -> (sut: ListViewController, loader: LoaderSpy) {

‎EssentialApp/EssentialAppTests/Helpers/FeedUIIntegrationTests+LoaderSpy.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import Combine
99

1010
extension FeedUIIntegrationTests {
1111

12+
@MainActor
1213
class LoaderSpy {
1314

1415
// MARK: - FeedLoader

0 commit comments

Comments
 (0)