Make adjustments to Makefile and tests for Xcode 14.1

Author: mluisbrown

Makefile

@@ -1,7 +1,8 @@
 PLATFORM_IOS = iOS Simulator,name=iPhone 11 Pro Max
 PLATFORM_MACOS = macOS
 PLATFORM_TVOS = tvOS Simulator,name=Apple TV
-PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 5 - 44mm
+PLATFORM_WATCHOS = watchOS Simulator,name=Apple Watch Series 7 (45mm)
+
 default: test-all
 
 test-all: test-library test-examples
@@ -34,27 +35,11 @@ test-docs:
 		&& exit 1)
 
 test-examples:
-	xcodebuild test \
-		-scheme "CaseStudies (SwiftUI)" \
-		-destination platform="$(PLATFORM_IOS)"
-	xcodebuild test \
-		-scheme "CaseStudies (UIKit)" \
-		-destination platform="$(PLATFORM_IOS)"
-	xcodebuild test \
-		-scheme Search \
-		-destination platform="$(PLATFORM_IOS)"
-	xcodebuild test \
-		-scheme SpeechRecognition \
-		-destination platform="$(PLATFORM_IOS)"
-	xcodebuild test \
-		-scheme TicTacToe \
-		-destination platform="$(PLATFORM_IOS)"
-	xcodebuild test \
-		-scheme Todos \
-		-destination platform="$(PLATFORM_IOS)"
-	xcodebuild test \
-		-scheme VoiceMemos \
-		-destination platform="$(PLATFORM_IOS)"
+	for scheme in "CaseStudies (SwiftUI)" "CaseStudies (UIKit)" Search SpeechRecognition TicTacToe Todos VoiceMemos; do \
+		xcodebuild test \
+			-scheme $$scheme \
+			-destination platform="$(PLATFORM_IOS)"; \
+	done
 
 benchmark:
 	swift run --configuration release \

Sources/ComposableArchitecture/ViewStore.swift

@@ -487,7 +487,6 @@ private struct HashableWrapper<Value>: Hashable {
     public func yield(while predicate: @escaping (State) -> Bool) async {
       let cancellable = Box<Disposable?>(wrappedValue: nil)
       try? await withTaskCancellationHandler(
-        handler: { cancellable.wrappedValue?.dispose() },
         operation: {
           try Task.checkCancellation()
           try await withUnsafeThrowingContinuation {
@@ -504,9 +503,9 @@ private struct HashableWrapper<Value>: Hashable {
                 _ = cancellable
               }
           }
-        }
+        },
+        onCancel: { cancellable.wrappedValue?.dispose() }
       )
-
     }
   }
 

Tests/ComposableArchitectureTests/ViewStoreTests.swift

@@ -172,8 +172,7 @@ final class ViewStoreTests: XCTestCase {
   }
 
   #if canImport(_Concurrency) && compiler(>=5.5.2)
-    func testSendWhile() {
-      let expectation = self.expectation(description: "await")
+    func testSendWhile() async {
       Task { @MainActor in
         enum Action {
           case response
@@ -197,13 +196,10 @@ final class ViewStoreTests: XCTestCase {
         XCTAssertNoDifference(viewStore.state, false)
         await viewStore.send(.tapped, while: { $0 })
         XCTAssertNoDifference(viewStore.state, false)
-        expectation.fulfill()
       }
-      self.wait(for: [expectation], timeout: 1)
     }
 
-    func testSuspend() {
-      let expectation = self.expectation(description: "await")
+    func testSuspend() async {
       Task { @MainActor in
         enum Action {
           case response
@@ -229,9 +225,7 @@ final class ViewStoreTests: XCTestCase {
         XCTAssertNoDifference(viewStore.state, true)
         await viewStore.yield(while: { $0 })
         XCTAssertNoDifference(viewStore.state, false)
-        expectation.fulfill()
       }
-      self.wait(for: [expectation], timeout: 1)
     }
   #endif
 }