Set SWIFT_STRICT_CONCURRENCY to complete in EssentialFeed and fix all warnings

Author: caiozullo

EssentialApp/EssentialAppTests/CommentsUIIntegrationTests.swift

@@ -9,6 +9,7 @@ import EssentialApp
 import EssentialFeed
 import EssentialFeediOS
 
+@MainActor
 class CommentsUIIntegrationTests: XCTestCase {
 
 	func test_commentsView_hasTitle() {

EssentialApp/EssentialAppTests/FeedAcceptanceTests.swift

@@ -7,6 +7,7 @@ import EssentialFeed
 import EssentialFeediOS
 @testable import EssentialApp
 
+@MainActor
 class FeedAcceptanceTests: XCTestCase {
 
 	func test_onLaunch_displaysRemoteFeedWhenCustomerHasConnectivity() throws {
@@ -183,6 +184,7 @@ class FeedAcceptanceTests: XCTestCase {
 
 }
 
+@MainActor
 extension CoreDataFeedStore {
 	static var empty: CoreDataFeedStore {
 		get throws {

EssentialApp/EssentialAppTests/FeedUIIntegrationTests.swift

@@ -8,6 +8,7 @@ import EssentialApp
 import EssentialFeed
 import EssentialFeediOS
 
+@MainActor
 class FeedUIIntegrationTests: XCTestCase {
 
 	func test_feedView_hasTitle() {

EssentialApp/EssentialAppTests/SceneDelegateTests.swift

@@ -6,6 +6,7 @@ import XCTest
 import EssentialFeediOS
 @testable import EssentialApp
 
+@MainActor
 class SceneDelegateTests: XCTestCase {
 
 	func test_configureWindow_setsWindowAsKeyAndVisible() throws {

EssentialFeed/EssentialFeed.xcodeproj/project.pbxproj

@@ -1543,7 +1543,9 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1577,6 +1579,8 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1600,7 +1604,9 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1624,6 +1630,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1646,6 +1654,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1668,6 +1678,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1690,6 +1702,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};
@@ -1712,6 +1726,8 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx";
 				SUPPORTS_MACCATALYST = NO;
+				SWIFT_APPROACHABLE_CONCURRENCY = YES;
+				SWIFT_STRICT_CONCURRENCY = complete;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;
 			};

EssentialFeed/EssentialFeed/Feed Cache/Infrastructure/CoreData/CoreDataFeedStore.swift

@@ -4,8 +4,10 @@
 
 import CoreData
 
-public final class CoreDataFeedStore {
+public final class CoreDataFeedStore: Sendable {
 	private static let modelName = "FeedStore"
+	
+	@MainActor
 	private static let model = NSManagedObjectModel.with(name: modelName, in: Bundle(for: CoreDataFeedStore.self))
 
 	private let container: NSPersistentContainer
@@ -25,11 +27,16 @@ public final class CoreDataFeedStore {
 		context == container.viewContext ? .main : .background
 	}
 
-	public init(storeURL: URL, contextQueue: ContextQueue = .background) throws {
+	@MainActor
+	public convenience init(storeURL: URL, contextQueue: ContextQueue = .background) throws {
 		guard let model = CoreDataFeedStore.model else {
 			throw StoreError.modelNotFound
 		}
 
+		try self.init(storeURL: storeURL, contextQueue: contextQueue, model: model)
+	}
+	
+	public init(storeURL: URL, contextQueue: ContextQueue = .background, model: NSManagedObjectModel) throws {
 		do {
 			container = try NSPersistentContainer.load(name: CoreDataFeedStore.modelName, model: model, url: storeURL)
 			context = contextQueue == .main ? container.viewContext : container.newBackgroundContext()
@@ -38,7 +45,7 @@ public final class CoreDataFeedStore {
 		}
 	}
 
-	public func perform(_ action: @escaping () -> Void) {
+	public func perform(_ action: @Sendable @escaping () -> Void) {
 		context.perform(action)
 	}
 

EssentialFeed/EssentialFeed/Shared API Infra/URLSessionHTTPClient.swift

@@ -21,7 +21,7 @@ public final class URLSessionHTTPClient: HTTPClient {
 		}
 	}
 
-	public func get(from url: URL, completion: @escaping (HTTPClient.Result) -> Void) -> HTTPClientTask {
+	public func get(from url: URL, completion: @Sendable @escaping (HTTPClient.Result) -> Void) -> HTTPClientTask {
 		let task = session.dataTask(with: url) { data, response, error in
 			completion(Result {
 				if let error = error {

EssentialFeed/EssentialFeed/Shared API/HTTPClient.swift

@@ -14,5 +14,5 @@ public protocol HTTPClient {
 	/// The completion handler can be invoked in any thread.
 	/// Clients are responsible to dispatch to appropriate threads, if needed.
 	@discardableResult
-	func get(from url: URL, completion: @escaping (Result) -> Void) -> HTTPClientTask
+	func get(from url: URL, completion: @Sendable @escaping (Result) -> Void) -> HTTPClientTask
 }

EssentialFeed/EssentialFeedAPIEndToEndTests/EssentialFeedAPIEndToEndTests.swift

@@ -5,10 +5,11 @@
 import XCTest
 import EssentialFeed
 
+@MainActor
 class EssentialFeedAPIEndToEndTests: XCTestCase {
 
-	func test_endToEndTestServerGETFeedResult_matchesFixedTestAccountData() {
-		switch getFeedResult() {
+	func test_endToEndTestServerGETFeedResult_matchesFixedTestAccountData() async {
+		switch await getFeedResult() {
 		case let .success(imageFeed)?:
 			XCTAssertEqual(imageFeed.count, 8, "Expected 8 images in the test account image feed")
 			XCTAssertEqual(imageFeed[0], expectedImage(at: 0))
@@ -28,8 +29,8 @@ class EssentialFeedAPIEndToEndTests: XCTestCase {
 		}
 	}
 
-	func test_endToEndTestServerGETFeedImageDataResult_matchesFixedTestAccountData() {
-		switch getFeedImageDataResult() {
+	func test_endToEndTestServerGETFeedImageDataResult_matchesFixedTestAccountData() async {
+		switch await getFeedImageDataResult() {
 		case let .success(data)?:
 			XCTAssertFalse(data.isEmpty, "Expected non-empty image data")
 
@@ -43,45 +44,37 @@ class EssentialFeedAPIEndToEndTests: XCTestCase {
 
 	// MARK: - Helpers
 
-	private func getFeedResult(file: StaticString = #filePath, line: UInt = #line) -> Swift.Result<[FeedImage], Error>? {
+	private func getFeedResult(file: StaticString = #filePath, line: UInt = #line) async -> Swift.Result<[FeedImage], Error>? {
 		let client = ephemeralClient()
-		let exp = expectation(description: "Wait for load completion")
 
-		var receivedResult: Swift.Result<[FeedImage], Error>?
-		client.get(from: feedTestServerURL) { result in
-			receivedResult = result.flatMap { (data, response) in
-				do {
-					return .success(try FeedItemsMapper.map(data, from: response))
-				} catch {
-					return .failure(error)
-				}
+		return await withCheckedContinuation { continuation in
+			client.get(from: feedTestServerURL) { result in
+				continuation.resume(returning:  result.flatMap { (data, response) in
+					do {
+						return .success(try FeedItemsMapper.map(data, from: response))
+					} catch {
+						return .failure(error)
+					}
+				})
 			}
-			exp.fulfill()
 		}
-		wait(for: [exp], timeout: 5.0)
-		
-		return receivedResult
 	}
 
-	private func getFeedImageDataResult(file: StaticString = #filePath, line: UInt = #line) -> Result<Data, Error>? {
+	private func getFeedImageDataResult(file: StaticString = #filePath, line: UInt = #line) async -> Result<Data, Error>? {
 		let client = ephemeralClient()
 		let url = feedTestServerURL.appendingPathComponent("73A7F70C-75DA-4C2E-B5A3-EED40DC53AA6/image")
-		let exp = expectation(description: "Wait for load completion")
 
-		var receivedResult: Result<Data, Error>?
-		client.get(from: url) { result in
-			receivedResult = result.flatMap { (data, response) in
-				do {
-					return .success(try FeedImageDataMapper.map(data, from: response))
-				} catch {
-					return .failure(error)
-				}
+		return await withCheckedContinuation { continuation in
+			client.get(from: url) { result in
+				continuation.resume(returning:  result.flatMap { (data, response) in
+					do {
+						return .success(try FeedImageDataMapper.map(data, from: response))
+					} catch {
+						return .failure(error)
+					}
+				})
 			}
-			exp.fulfill()
 		}
-		wait(for: [exp], timeout: 5.0)
-		
-		return receivedResult
 	}
 
 	private var feedTestServerURL: URL {

EssentialFeed/EssentialFeedCacheIntegrationTests/EssentialFeedCacheIntegrationTests.swift

@@ -5,16 +5,17 @@
 import XCTest
 import EssentialFeed
 
+@MainActor
 class EssentialFeedCacheIntegrationTests: XCTestCase {
 
-	override func setUp() {
-		super.setUp()
+	override func setUp() async throws {
+		try await super.setUp()
 
 		setupEmptyStoreState()
 	}
 
-	override func tearDown() {
-		super.tearDown()
+	override func tearDown() async throws {
+		try await super.tearDown()
 
 		undoStoreSideEffects()
 	}