Skip to content

Commit e6e1c8a

Browse files
committed
Merge remote-tracking branch 'origin/main' into fix-uikit-identifiable-dismiss
2 parents f8cb67d + 62adec5 commit e6e1c8a

35 files changed

+331
-70
lines changed

Examples/Integration/Integration/iOS 17/ObservableSharedStateTestCase.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,12 @@ private struct Feature {
112112
defaults.removeObject(forKey: "isOn")
113113
}
114114
case .resetButtonTapped:
115-
state.isAppStorageOn1 = false
116-
state.isAppStorageOn2 = false
117-
state.fileStorage1.isOn = false
118-
state.fileStorage2.isOn = false
119-
state.isInMemoryOn1 = false
120-
state.isInMemoryOn2 = false
115+
state.$isAppStorageOn1.withLock { $0 = false }
116+
state.$isAppStorageOn2.withLock { $0 = false }
117+
state.$fileStorage1.withLock { $0.isOn = false }
118+
state.$fileStorage2.withLock { $0.isOn = false }
119+
state.$isInMemoryOn1.withLock { $0 = false }
120+
state.$isInMemoryOn2.withLock { $0 = false }
121121
return .none
122122
case .writeToFileStorageButtonTapped:
123123
return .run { [isOn = state.fileStorage1.isOn] _ in

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ day-to-day when building applications, such as:
5050
## Learn More
5151

5252
The Composable Architecture was designed over the course of many episodes on
53-
[Point-Free][pointfreeco], a video series exploring functional programming and the Swift language,
53+
[Point-Free][pointfreeco], a video series exploring advanced programming topics in the Swift language,
5454
hosted by [Brandon Williams][mbrandonw] and [Stephen Celis][stephencelis].
5555

5656
You can watch all of the episodes [here][tca-episode-collection], as well as a dedicated, [multipart

Sources/ComposableArchitecture/Core.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ final class RootCore<Root: Reducer>: Core {
6565
_send(action)
6666
}
6767
}
68-
func _send(_ action: Root.Action) -> Task<Void, Never>? {
68+
private func _send(_ action: Root.Action) -> Task<Void, Never>? {
6969
self.bufferedActions.append(action)
7070
guard !self.isSending else { return nil }
7171

Sources/ComposableArchitecture/Documentation.docc/Articles/StackBasedNavigation.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -404,10 +404,10 @@ struct Feature {
404404

405405
@Reducer
406406
struct Path {
407-
enum State: Equatable { case counter(Counter.State) }
408-
enum Action { case counter(Counter.Action) }
407+
enum State: Equatable { case counter(CounterFeature.State) }
408+
enum Action { case counter(CounterFeature.Action) }
409409
var body: some ReducerOf<Self> {
410-
Scope(state: \.counter, action: \.counter) { Counter() }
410+
Scope(state: \.counter, action: \.counter) { CounterFeature() }
411411
}
412412
}
413413

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/02-MultipleDestinations/02-02-02-code-0011.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ struct ContactsFeature {
4848
return .none
4949
}
5050
}
51-
.ifLet(\.$destination, action: \.destination)
51+
.ifLet(\.$destination, action: \.destination) {
52+
Destination.body
53+
}
5254
}
5355
}

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/02-MultipleDestinations/02-02-MultipleDestinations.tutorial

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
}
130130

131131
@Step {
132-
Add a case for for the "Add contact" feature. Note that we are holding onto the actual
132+
Add a case for the "Add contact" feature. Note that we are holding onto the actual
133133
`AddContactFeature` reducer in the case, not the state. The
134134
``ComposableArchitecture/Reducer()`` macro will fill in all the requirements for the reducer
135135
protocol for us automatically.

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0006-previous.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ struct ContactsFeature {
4949
}
5050
}
5151
.ifLet(\.$destination, action: \.destination) {
52-
Destination()
52+
Destination.body
5353
}
5454
}
5555
}

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0006.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct ContactsFeature {
5050
}
5151
}
5252
.ifLet(\.$destination, action: \.destination) {
53-
Destination()
53+
Destination.body
5454
}
5555
}
5656
}

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-01-code-0007.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct ContactsFeature {
5050
}
5151
}
5252
.ifLet(\.$destination, action: \.destination) {
53-
Destination()
53+
Destination.body
5454
}
5555
}
5656
}

Sources/ComposableArchitecture/Documentation.docc/Tutorials/MeetTheComposableArchitecture/02-Navigation/03-TestingPresentation/02-03-03-code-0007-previous.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct ContactsFeature {
5050
}
5151
}
5252
.ifLet(\.$destination, action: \.destination) {
53-
Destination()
53+
Destination.body
5454
}
5555
}
5656
}

0 commit comments

Comments
 (0)