Merge remote-tracking branch 'origin/main' into core

stephencelis · stephencelis · commit 58fddea67467 · 2025-02-27T15:25:50.000-08:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,7 +21,7 @@ jobs:
       matrix:
         command: [test, '']
         platform: [IOS, MACOS]
-        xcode: ['16.0']
+        xcode: ['16.2']
     steps:
       - uses: actions/checkout@v4
       - name: Select Xcode ${{ matrix.xcode }}
@@ -117,27 +117,27 @@ jobs:
           restore-keys: |
             deriveddata-examples-
       - name: Select Xcode 16
-        run: sudo xcode-select -s /Applications/Xcode_16.0.app
+        run: sudo xcode-select -s /Applications/Xcode_16.2.app
       - name: Set IgnoreFileSystemDeviceInodeChanges flag
         run: defaults write com.apple.dt.XCBuild IgnoreFileSystemDeviceInodeChanges -bool YES
       - name: Update mtime for incremental builds
         uses: chetan/git-restore-mtime-action@v2
       - name: CaseStudies (SwiftUI)
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="CaseStudies (SwiftUI)" xcodebuild-raw
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="CaseStudies (SwiftUI)" xcodebuild
       - name: CaseStudies (UIKit)
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="CaseStudies (UIKit)" xcodebuild-raw
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="CaseStudies (UIKit)" xcodebuild
       - name: Search
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Search" xcodebuild-raw
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Search" xcodebuild
       - name: SyncUps
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SyncUps" xcodebuild-raw
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SyncUps" xcodebuild
       - name: SpeechRecognition
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SpeechRecognition" xcodebuild-raw
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="SpeechRecognition" xcodebuild
       - name: TicTacToe
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="TicTacToe" xcodebuild-raw
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="TicTacToe" xcodebuild
       - name: Todos
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Todos" xcodebuild-raw
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="Todos" xcodebuild
       - name: VoiceMemos
-        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="VoiceMemos" xcodebuild-raw
+        run: make DERIVED_DATA_PATH=~/.derivedData SCHEME="VoiceMemos" xcodebuild
 
   check-macro-compatibility:
     name: Check Macro Compatibility
diff --git a/.github/workflows/documentation.yml b/.github/workflows/documentation.yml
@@ -41,10 +41,10 @@ jobs:
 
           for tag in $(echo "main"; git tag -l --sort=-v:refname | grep -e "\d\+\.\d\+.0" | head -6);
           do
-            if [ -d "docs-out/$tag/data/documentation/composablearchitecture" ] 
-            then 
+            if [ -d "docs-out/$tag/data/documentation/composablearchitecture" ]
+            then
               echo "✅ Documentation for "$tag" already exists.";
-            else 
+            else
               echo "⏳ Generating documentation for ComposableArchitecture @ "$tag" release.";
               rm -rf "docs-out/$tag";
 
diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Makefile b/Makefile
@@ -2,12 +2,12 @@ CONFIG = Debug
 
 DERIVED_DATA_PATH = ~/.derivedData/$(CONFIG)
 
-PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iOS,iPhone \d\+ Pro [^M])
+PLATFORM_IOS = iOS Simulator,id=$(call udid_for,iPhone)
 PLATFORM_MACOS = macOS
 PLATFORM_MAC_CATALYST = macOS,variant=Mac Catalyst
-PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,tvOS,TV)
-PLATFORM_VISIONOS = visionOS Simulator,id=$(call udid_for,visionOS,Vision)
-PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,watchOS,Watch)
+PLATFORM_TVOS = tvOS Simulator,id=$(call udid_for,TV)
+PLATFORM_VISIONOS = visionOS Simulator,id=$(call udid_for,Vision)
+PLATFORM_WATCHOS = watchOS Simulator,id=$(call udid_for,Watch)
 
 PLATFORM = IOS
 DESTINATION = platform="$(PLATFORM_$(PLATFORM))"
@@ -47,7 +47,6 @@ warm-simulator:
 xcodebuild: warm-simulator
 	$(XCODEBUILD)
 
-# Workaround for debugging Swift Testing tests: https://github.com/cpisciotta/xcbeautify/issues/313
 xcodebuild-raw: warm-simulator
 	$(XCODEBUILD_COMMAND)
 
@@ -69,5 +68,5 @@ format:
 .PHONY: build-for-library-evolution format warm-simulator xcodebuild xcodebuild-raw
 
 define udid_for
-$(shell xcrun simctl list devices available '$(1)' | grep '$(2)' | sort -r | head -1 | awk -F '[()]' '{ print $$(NF-3) }')
+$(shell xcrun simctl list --json devices available '$(1)' | jq -r '[.devices|to_entries|sort_by(.key)|reverse|.[].value|select(length > 0)|.[0]][0].udid')
 endef
diff --git a/Package.resolved b/Package.resolved
diff --git a/Sources/ComposableArchitecture/Core.swift b/Sources/ComposableArchitecture/Core.swift
@@ -92,14 +92,14 @@ final class RootCore<Root: Reducer>: Core {
       defer { index += 1 }
       let action = self.bufferedActions[index]
       let effect = reducer.reduce(into: &currentState, action: action)
+      let uuid = UUID()
 
       switch effect.operation {
       case .none:
         break
       case let .publisher(publisher):
         var didComplete = false
         let boxedTask = Box<Task<Void, Never>?>(wrappedValue: nil)
-        let uuid = UUID()
         let effectCancellable = withEscapedDependencies { continuation in
           publisher
             .receive(on: UIScheduler.shared)
@@ -128,11 +128,13 @@ final class RootCore<Root: Reducer>: Core {
           }
           boxedTask.wrappedValue = task
           tasks.withValue { $0.append(task) }
-          self.effectCancellables[uuid] = effectCancellable
+          self.effectCancellables[uuid] = AnyCancellable {
+            task.cancel()
+          }
         }
       case let .run(priority, operation):
         withEscapedDependencies { continuation in
-          let task = Task(priority: priority) { @MainActor in
+          let task = Task(priority: priority) { @MainActor [weak self] in
             let isCompleted = LockIsolated(false)
             defer { isCompleted.setValue(true) }
             await operation(
@@ -158,14 +160,18 @@ final class RootCore<Root: Reducer>: Core {
                   )
                 }
                 if let task = continuation.yield({
-                  self.send(effectAction)
+                  self?.send(effectAction)
                 }) {
                   tasks.withValue { $0.append(task) }
                 }
               }
             )
+            self?.effectCancellables[uuid] = nil
           }
           tasks.withValue { $0.append(task) }
+          self.effectCancellables[uuid] = AnyCancellable {
+            task.cancel()
+          }
         }
       }
     }
diff --git a/Tests/ComposableArchitectureTests/StoreLifetimeTests.swift b/Tests/ComposableArchitectureTests/StoreLifetimeTests.swift
@@ -2,6 +2,7 @@ import Combine
 @_spi(Logging) import ComposableArchitecture
 import XCTest
 
+@available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
 final class StoreLifetimeTests: BaseTCATestCase {
   @available(*, deprecated)
   @MainActor
@@ -69,9 +70,6 @@ final class StoreLifetimeTests: BaseTCATestCase {
 
     @MainActor
     func testStoreDeinit_RunningEffect() async {
-      XCTTODO(
-        "We would like for this to pass, but it requires full deprecation of uncached child stores"
-      )
       Logger.shared.isEnabled = true
       let effectFinished = self.expectation(description: "Effect finished")
       do {
@@ -99,9 +97,6 @@ final class StoreLifetimeTests: BaseTCATestCase {
 
     @MainActor
     func testStoreDeinit_RunningCombineEffect() async {
-      XCTTODO(
-        "We would like for this to pass, but it requires full deprecation of uncached child stores"
-      )
       Logger.shared.isEnabled = true
       let effectFinished = self.expectation(description: "Effect finished")
       do {
@@ -129,28 +124,61 @@ final class StoreLifetimeTests: BaseTCATestCase {
       await self.fulfillment(of: [effectFinished], timeout: 0.5)
     }
   #endif
+
+  @MainActor
+  @available(*, deprecated)
+  func testUnCachedStores() async {
+    Logger.shared.isEnabled = true
+    let clock = TestClock()
+    let store = Store(initialState: Parent.State()) {
+      Parent()
+    } withDependencies: {
+      $0.continuousClock = clock
+    }
+    do {
+      let child = store.scope(state: { $0.child }, action: { .child($0) })
+      child.send(.start)
+      XCTAssertEqual(store.withState(\.child.count), 1)
+    }
+    await clock.run()
+    XCTAssertEqual(store.withState(\.child.count), 2)
+  }
 }
 
 @Reducer
+@available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
 private struct Child {
   struct State: Equatable {
     var count = 0
   }
   enum Action {
     case tap
+    case start
+    case response
   }
+  @Dependency(\.continuousClock) var clock
   var body: some ReducerOf<Self> {
     Reduce { state, action in
       switch action {
       case .tap:
         state.count += 1
         return .none
+      case .start:
+        state.count += 1
+        return .run { send in
+          try await clock.sleep(for: .seconds(0))
+          await send(.response)
+        }
+      case .response:
+        state.count += 1
+        return .none
       }
     }
   }
 }
 
 @Reducer
+@available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
 private struct Parent {
   struct State: Equatable {
     var child = Child.State()
@@ -166,6 +194,7 @@ private struct Parent {
 }
 
 @Reducer
+@available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
 private struct Grandparent {
   struct State: Equatable {
     var child = Parent.State()

Original file line number	Diff line number	Diff line change
`@@ -92,14 +92,14 @@ final class RootCore<Root: Reducer>: Core {`
`92`	`92`	`defer { index += 1 }`
`93`	`93`	`let action = self.bufferedActions[index]`
`94`	`94`	`let effect = reducer.reduce(into: &currentState, action: action)`
	`95`	`+ let uuid = UUID()`
`95`	`96`
`96`	`97`	`switch effect.operation {`
`97`	`98`	`case .none:`
`98`	`99`	`break`
`99`	`100`	`case let .publisher(publisher):`
`100`	`101`	`var didComplete = false`
`101`	`102`	`let boxedTask = Box<Task<Void, Never>?>(wrappedValue: nil)`
`102`		`- let uuid = UUID()`
`103`	`103`	`let effectCancellable = withEscapedDependencies { continuation in`
`104`	`104`	`publisher`
`105`	`105`	`.receive(on: UIScheduler.shared)`
`@@ -128,11 +128,13 @@ final class RootCore<Root: Reducer>: Core {`
`128`	`128`	`}`
`129`	`129`	`boxedTask.wrappedValue = task`
`130`	`130`	`tasks.withValue { $0.append(task) }`
`131`		`- self.effectCancellables[uuid] = effectCancellable`
	`131`	`+ self.effectCancellables[uuid] = AnyCancellable {`
	`132`	`+ task.cancel()`
	`133`	`+ }`
`132`	`134`	`}`
`133`	`135`	`case let .run(priority, operation):`
`134`	`136`	`withEscapedDependencies { continuation in`
`135`		`- let task = Task(priority: priority) { @MainActor in`
	`137`	`+ let task = Task(priority: priority) { @MainActor [weak self] in`
`136`	`138`	`let isCompleted = LockIsolated(false)`
`137`	`139`	`defer { isCompleted.setValue(true) }`
`138`	`140`	`await operation(`
`@@ -158,14 +160,18 @@ final class RootCore<Root: Reducer>: Core {`
`158`	`160`	`)`
`159`	`161`	`}`
`160`	`162`	`if let task = continuation.yield({`
`161`		`- self.send(effectAction)`
	`163`	`+ self?.send(effectAction)`
`162`	`164`	`}) {`
`163`	`165`	`tasks.withValue { $0.append(task) }`
`164`	`166`	`}`
`165`	`167`	`}`
`166`	`168`	`)`
	`169`	`+ self?.effectCancellables[uuid] = nil`
`167`	`170`	`}`
`168`	`171`	`tasks.withValue { $0.append(task) }`
	`172`	`+ self.effectCancellables[uuid] = AnyCancellable {`
	`173`	`+ task.cancel()`
	`174`	`+ }`
`169`	`175`	`}`
`170`	`176`	`}`
`171`	`177`	`}`