Set SWIFT_STRICT_CONCURRENCY to complete in EssentialApp and fix all warnings

caiozullo · caiozullo · commit b206b3f19fe1 · 2025-10-24T13:48:12.000+02:00
diff --git a/EssentialApp/EssentialApp.xcodeproj/project.pbxproj b/EssentialApp/EssentialApp.xcodeproj/project.pbxproj
@@ -508,6 +508,8 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -532,6 +534,8 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -556,7 +560,9 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EssentialApp.app/EssentialApp";
@@ -582,6 +588,8 @@
 				SUPPORTS_MACCATALYST = NO;
 				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/EssentialApp.app/EssentialApp";
diff --git a/EssentialApp/EssentialApp/CombineHelpers.swift b/EssentialApp/EssentialApp/CombineHelpers.swift
@@ -40,7 +40,10 @@ public extension HTTPClient {
 		
 		return Deferred {
 			Future { completion in
-				task = self.get(from: url, completion: completion)
+				nonisolated(unsafe) let uncheckedCompletion = completion
+				task = self.get(from: url, completion: {
+					uncheckedCompletion($0)
+				})
 			}
 		}
 		.handleEvents(receiveCancel: { task?.cancel() })
@@ -229,7 +232,8 @@ extension AnyDispatchQueueScheduler {
 			if store.contextQueue == .main, Thread.isMainThread {
 				action()
 			} else {
-				store.perform(action)
+				nonisolated(unsafe) let uncheckedAction = action
+				store.perform { uncheckedAction() }
 			}
 			return AnyCancellable {}
 		}
@@ -238,15 +242,17 @@ extension AnyDispatchQueueScheduler {
 			if store.contextQueue == .main, Thread.isMainThread {
 				action()
 			} else {
-				store.perform(action)
+				nonisolated(unsafe) let uncheckedAction = action
+				store.perform { uncheckedAction() }
 			}
 		}
 		
 		func schedule(options: DispatchQueue.SchedulerOptions?, _ action: @escaping () -> Void) {
 			if store.contextQueue == .main, Thread.isMainThread {
 				action()
 			} else {
-				store.perform(action)
+				nonisolated(unsafe) let uncheckedAction = action
+				store.perform { uncheckedAction() }
 			}
 		}
 	}
diff --git a/EssentialApp/EssentialApp/CommentsUIComposer.swift b/EssentialApp/EssentialApp/CommentsUIComposer.swift
@@ -7,6 +7,7 @@ import Combine
 import EssentialFeed
 import EssentialFeediOS
 
+@MainActor
 public final class CommentsUIComposer {
 	private init() {}
 	
@@ -38,6 +39,7 @@ public final class CommentsUIComposer {
 	}
 }
 
+@MainActor
 final class CommentsViewAdapter: ResourceView {
 	private weak var controller: ListViewController?
 	
diff --git a/EssentialApp/EssentialApp/FeedUIComposer.swift b/EssentialApp/EssentialApp/FeedUIComposer.swift
@@ -7,15 +7,16 @@ import Combine
 import EssentialFeed
 import EssentialFeediOS
 
+@MainActor
 public final class FeedUIComposer {
 	private init() {}
 	
 	private typealias FeedPresentationAdapter = LoadResourcePresentationAdapter<Paginated<FeedImage>, FeedViewAdapter>
 	
 	public static func feedComposedWith(
-		feedLoader: @escaping () -> AnyPublisher<Paginated<FeedImage>, Error>,
-		imageLoader: @escaping (URL) -> FeedImageDataLoader.Publisher,
-		selection: @escaping (FeedImage) -> Void = { _ in }
+		feedLoader: @MainActor @escaping () -> AnyPublisher<Paginated<FeedImage>, Error>,
+		imageLoader: @MainActor @escaping (URL) -> FeedImageDataLoader.Publisher,
+		selection: @MainActor @escaping (FeedImage) -> Void = { _ in }
 	) -> ListViewController {
 		let presentationAdapter = FeedPresentationAdapter(loader: feedLoader)
 		
diff --git a/EssentialApp/EssentialApp/FeedViewAdapter.swift b/EssentialApp/EssentialApp/FeedViewAdapter.swift
@@ -6,6 +6,7 @@ import UIKit
 import EssentialFeed
 import EssentialFeediOS
 
+@MainActor
 final class FeedViewAdapter: ResourceView {
 	private weak var controller: ListViewController?
 	private let imageLoader: (URL) -> FeedImageDataLoader.Publisher
diff --git a/EssentialApp/EssentialApp/LoadResourcePresentationAdapter.swift b/EssentialApp/EssentialApp/LoadResourcePresentationAdapter.swift
@@ -6,6 +6,7 @@ import Combine
 import EssentialFeed
 import EssentialFeediOS
 
+@MainActor
 final class LoadResourcePresentationAdapter<Resource, View: ResourceView> {
 	private let loader: () -> AnyPublisher<Resource, Error>
 	private var cancellable: Cancellable?
diff --git a/EssentialApp/EssentialAppTests/CommentsUIIntegrationTests.swift b/EssentialApp/EssentialAppTests/CommentsUIIntegrationTests.swift
@@ -108,18 +108,6 @@ class CommentsUIIntegrationTests: XCTestCase {
 		assertThat(sut, isRendering: [comment])
 	}
 	
-	func test_loadCommentsCompletion_dispatchesFromBackgroundToMainThread() {
-		let (sut, loader) = makeSUT()
-		sut.simulateAppearance()
-		
-		let exp = expectation(description: "Wait for background queue")
-		DispatchQueue.global().async {
-			loader.completeCommentsLoading(at: 0)
-			exp.fulfill()
-		}
-		wait(for: [exp], timeout: 1.0)
-	}
-	
 	func test_loadCommentsCompletion_rendersErrorMessageOnErrorUntilNextReload() {
 		let (sut, loader) = makeSUT()
 		
diff --git a/EssentialApp/EssentialAppTests/FeedUIIntegrationTests.swift b/EssentialApp/EssentialAppTests/FeedUIIntegrationTests.swift
@@ -138,18 +138,6 @@ class FeedUIIntegrationTests: XCTestCase {
 		assertThat(sut, isRendering: [image0])
 	}
 	
-	func test_loadFeedCompletion_dispatchesFromBackgroundToMainThread() {
-		let (sut, loader) = makeSUT()
-		sut.simulateAppearance()
-		
-		let exp = expectation(description: "Wait for background queue")
-		DispatchQueue.global().async {
-			loader.completeFeedLoading(at: 0)
-			exp.fulfill()
-		}
-		wait(for: [exp], timeout: 1.0)
-	}
-	
 	func test_loadFeedCompletion_rendersErrorMessageOnErrorUntilNextReload() {
 		let (sut, loader) = makeSUT()
 		
@@ -226,20 +214,6 @@ class FeedUIIntegrationTests: XCTestCase {
 		XCTAssertFalse(sut.isShowingLoadMoreFeedIndicator, "Expected no loading indicator once user initiated loading completes with error")
 	}
 	
-	func test_loadMoreCompletion_dispatchesFromBackgroundToMainThread() {
-		let (sut, loader) = makeSUT()
-		sut.simulateAppearance()
-		loader.completeFeedLoading(at: 0)
-		sut.simulateLoadMoreFeedAction()
-		
-		let exp = expectation(description: "Wait for background queue")
-		DispatchQueue.global().async {
-			loader.completeLoadMore()
-			exp.fulfill()
-		}
-		wait(for: [exp], timeout: 1.0)
-	}
-	
 	func test_loadMoreCompletion_rendersErrorMessageOnError() {
 		let (sut, loader) = makeSUT()
 		sut.simulateAppearance()
@@ -546,21 +520,6 @@ class FeedUIIntegrationTests: XCTestCase {
 		XCTAssertNil(view?.renderedImage, "Expected no rendered image when an image load finishes after the view is not visible anymore")
 	}
 	
-	func test_loadImageDataCompletion_dispatchesFromBackgroundToMainThread() {
-		let (sut, loader) = makeSUT()
-		
-		sut.simulateAppearance()
-		loader.completeFeedLoading(with: [makeImage()])
-		_ = sut.simulateFeedImageViewVisible(at: 0)
-		
-		let exp = expectation(description: "Wait for background queue")
-		DispatchQueue.global().async {
-			loader.completeImageLoading(with: self.anyImageData(), at: 0)
-			exp.fulfill()
-		}
-		wait(for: [exp], timeout: 1.0)
-	}
-	
 	func test_feedImageView_doesNotLoadImageAgainUntilPreviousRequestCompletes() {
 		let image = makeImage(url: URL(string: "http://url-0.com")!)
 		let (sut, loader) = makeSUT()
@@ -590,7 +549,7 @@ class FeedUIIntegrationTests: XCTestCase {
 	// MARK: - Helpers
 	
 	private func makeSUT(
-		selection: @escaping (FeedImage) -> Void = { _ in },
+		selection: @MainActor @escaping (FeedImage) -> Void = { _ in },
 		file: StaticString = #filePath,
 		line: UInt = #line
 	) -> (sut: ListViewController, loader: LoaderSpy) {
diff --git a/EssentialApp/EssentialAppTests/Helpers/FeedUIIntegrationTests+LoaderSpy.swift b/EssentialApp/EssentialAppTests/Helpers/FeedUIIntegrationTests+LoaderSpy.swift
@@ -9,6 +9,7 @@ import Combine
 
 extension FeedUIIntegrationTests {
 	
+	@MainActor
 	class LoaderSpy {
 		
 		// MARK: - FeedLoader
diff --git a/EssentialApp/EssentialAppTests/Helpers/XCTestCase+MemoryLeakTracking.swift b/EssentialApp/EssentialAppTests/Helpers/XCTestCase+MemoryLeakTracking.swift
@@ -5,6 +5,7 @@
 import XCTest
 
 extension XCTestCase {
+	@MainActor
 	func trackForMemoryLeaks(_ instance: AnyObject, file: StaticString = #filePath, line: UInt = #line) {
 		addTeardownBlock { [weak instance] in
 			XCTAssertNil(instance, "Instance should have been deallocated. Potential memory leak.", file: file, line: line)
diff --git a/EssentialFeed/EssentialFeed/Feed Feature/FeedImage.swift b/EssentialFeed/EssentialFeed/Feed Feature/FeedImage.swift
@@ -4,7 +4,7 @@
 
 import Foundation
 
-public struct FeedImage: Hashable {
+public struct FeedImage: Hashable, Sendable {
 	public let id: UUID
 	public let description: String?
 	public let location: String?
diff --git a/EssentialFeed/EssentialFeed/Image Comments Presentation/ImageCommentsPresenter.swift b/EssentialFeed/EssentialFeed/Image Comments Presentation/ImageCommentsPresenter.swift
@@ -4,11 +4,11 @@
 
 import Foundation
 
-public struct ImageCommentsViewModel {
+public struct ImageCommentsViewModel: Sendable {
 	public let comments: [ImageCommentViewModel]
 }
 
-public struct ImageCommentViewModel: Hashable {
+public struct ImageCommentViewModel: Hashable, Sendable {
 	public let message: String
 	public let date: String
 	public let username: String

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,10 @@ public extension HTTPClient {`
`40`	`40`
`41`	`41`	`return Deferred {`
`42`	`42`	`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`	`+ })`
`44`	`47`	`}`
`45`	`48`	`}`
`46`	`49`	`.handleEvents(receiveCancel: { task?.cancel() })`
`@@ -229,7 +232,8 @@ extension AnyDispatchQueueScheduler {`
`229`	`232`	`if store.contextQueue == .main, Thread.isMainThread {`
`230`	`233`	`action()`
`231`	`234`	`} else {`
`232`		`- store.perform(action)`
	`235`	`+ nonisolated(unsafe) let uncheckedAction = action`
	`236`	`+ store.perform { uncheckedAction() }`
`233`	`237`	`}`
`234`	`238`	`return AnyCancellable {}`
`235`	`239`	`}`
`@@ -238,15 +242,17 @@ extension AnyDispatchQueueScheduler {`
`238`	`242`	`if store.contextQueue == .main, Thread.isMainThread {`
`239`	`243`	`action()`
`240`	`244`	`} else {`
`241`		`- store.perform(action)`
	`245`	`+ nonisolated(unsafe) let uncheckedAction = action`
	`246`	`+ store.perform { uncheckedAction() }`
`242`	`247`	`}`
`243`	`248`	`}`
`244`	`249`
`245`	`250`	`func schedule(options: DispatchQueue.SchedulerOptions?, _ action: @escaping () -> Void) {`
`246`	`251`	`if store.contextQueue == .main, Thread.isMainThread {`
`247`	`252`	`action()`
`248`	`253`	`} else {`
`249`		`- store.perform(action)`
	`254`	`+ nonisolated(unsafe) let uncheckedAction = action`
	`255`	`+ store.perform { uncheckedAction() }`
`250`	`256`	`}`
`251`	`257`	`}`
`252`	`258`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ import Combine`
`7`	`7`	`import EssentialFeed`
`8`	`8`	`import EssentialFeediOS`
`9`	`9`
	`10`	`+@MainActor`
`10`	`11`	`public final class CommentsUIComposer {`
`11`	`12`	`private init() {}`
`12`	`13`
`@@ -38,6 +39,7 @@ public final class CommentsUIComposer {`
`38`	`39`	`}`
`39`	`40`	`}`
`40`	`41`
	`42`	`+@MainActor`
`41`	`43`	`final class CommentsViewAdapter: ResourceView {`
`42`	`44`	`private weak var controller: ListViewController?`
`43`	`45`