Skip to content

Commit 6466536

Browse files
Merge branch 'pointfreeco:main' into dynamic2
2 parents 527c3db + 26dce23 commit 6466536

File tree

106 files changed

+2719
-1246
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+2719
-1246
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.DS_Store
22
/.build
3+
/.swiftpm
34
/Packages
45
/*.xcodeproj
56
xcuserdata/

.spi.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ builder:
88
- platform: tvos
99
scheme: ComposableArchitecture
1010
- platform: watchos
11-
scheme: ComposableArchitecture_watchOS
11+
scheme: ComposableArchitecture
1212
- documentation_targets: [ComposableArchitecture]

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

Lines changed: 0 additions & 7 deletions
This file was deleted.

.swiftpm/xcode/xcshareddata/xcschemes/ComposableArchitecture_watchOS.xcscheme

Lines changed: 0 additions & 67 deletions
This file was deleted.

.swiftpm/xcode/xcshareddata/xcschemes/swift-composable-architecture-benchmarks.xcscheme

Lines changed: 0 additions & 78 deletions
This file was deleted.

Examples/CaseStudies/CaseStudies.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
CA6AC2652451135C00C71CB3 /* CircularProgressView.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA6AC2612451135C00C71CB3 /* CircularProgressView.swift */; };
2424
CA6AC2662451135C00C71CB3 /* DownloadComponent.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA6AC2622451135C00C71CB3 /* DownloadComponent.swift */; };
2525
CA6AC2672451135C00C71CB3 /* DownloadClient.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA6AC2632451135C00C71CB3 /* DownloadClient.swift */; };
26+
CA78F0CD28DA47D70026C4AD /* 04-HigherOrderReducers-RecursionTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA78F0CC28DA47D70026C4AD /* 04-HigherOrderReducers-RecursionTests.swift */; };
2627
CA7BC8EE245CCFE4001FB69F /* 01-GettingStarted-SharedState.swift in Sources */ = {isa = PBXBuildFile; fileRef = CA7BC8ED245CCFE4001FB69F /* 01-GettingStarted-SharedState.swift */; };
2728
CAA9ADC22446587C0003A984 /* 02-Effects-Basics.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA9ADC12446587C0003A984 /* 02-Effects-Basics.swift */; };
2829
CAA9ADC424465AB00003A984 /* 02-Effects-BasicsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAA9ADC324465AB00003A984 /* 02-Effects-BasicsTests.swift */; };
@@ -167,6 +168,7 @@
167168
CA6AC2612451135C00C71CB3 /* CircularProgressView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CircularProgressView.swift; sourceTree = "<group>"; };
168169
CA6AC2622451135C00C71CB3 /* DownloadComponent.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadComponent.swift; sourceTree = "<group>"; };
169170
CA6AC2632451135C00C71CB3 /* DownloadClient.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownloadClient.swift; sourceTree = "<group>"; };
171+
CA78F0CC28DA47D70026C4AD /* 04-HigherOrderReducers-RecursionTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "04-HigherOrderReducers-RecursionTests.swift"; sourceTree = "<group>"; };
170172
CA7BC8ED245CCFE4001FB69F /* 01-GettingStarted-SharedState.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "01-GettingStarted-SharedState.swift"; sourceTree = "<group>"; };
171173
CAA9ADC12446587C0003A984 /* 02-Effects-Basics.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "02-Effects-Basics.swift"; sourceTree = "<group>"; };
172174
CAA9ADC324465AB00003A984 /* 02-Effects-BasicsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "02-Effects-BasicsTests.swift"; sourceTree = "<group>"; };
@@ -444,6 +446,7 @@
444446
DC07231624465D1E003A8B65 /* 02-Effects-TimersTests.swift */,
445447
CA410EE1247C73B400E41798 /* 02-Effects-WebSocketTests.swift */,
446448
CA0C0C4624B89BEC00CBDD8A /* 04-HigherOrderReducers-LifecycleTests.swift */,
449+
CA78F0CC28DA47D70026C4AD /* 04-HigherOrderReducers-RecursionTests.swift */,
447450
DC634B242448D15B00DAA016 /* 04-HigherOrderReducers-ReusableFavoritingTests.swift */,
448451
CA0C51FA245389CC00A04EAB /* 04-HigherOrderReducers-ReusableOfflineDownloadsTests.swift */,
449452
);
@@ -797,6 +800,7 @@
797800
DC07231724465D1E003A8B65 /* 02-Effects-TimersTests.swift in Sources */,
798801
CA50BE6024A8F46500FE7DBA /* 01-GettingStarted-AlertsAndConfirmationDialogsTests.swift in Sources */,
799802
CAA9ADC424465AB00003A984 /* 02-Effects-BasicsTests.swift in Sources */,
803+
CA78F0CD28DA47D70026C4AD /* 04-HigherOrderReducers-RecursionTests.swift in Sources */,
800804
4F5AC11F24ECC7E4009DC50B /* 01-GettingStarted-SharedStateTests.swift in Sources */,
801805
CAA9ADCC2446615B0003A984 /* 02-Effects-LongLivingTests.swift in Sources */,
802806
);

Examples/CaseStudies/SwiftUICaseStudies/00-Core.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import ComposableArchitecture
33
import UIKit
44
import XCTestDynamicOverlay
55

6-
struct RootState {
6+
struct RootState: Equatable {
77
var alertAndConfirmationDialog = AlertAndConfirmationDialogState()
88
var animation = AnimationsState()
99
var bindingBasics = BindingBasicsState()
@@ -276,8 +276,6 @@ let rootReducer = Reducer<RootState, RootAction, RootEnvironment>.combine(
276276
environment: { .init(mainQueue: $0.mainQueue, webSocket: $0.webSocket) }
277277
)
278278
)
279-
.debug()
280-
.signpost()
281279

282280
@Sendable private func liveFetchNumber() async throws -> Int {
283281
try await Task.sleep(nanoseconds: NSEC_PER_SEC)

0 commit comments

Comments
 (0)