Skip to content

Commit cca1554

Browse files
stephencelismluisbrown
authored andcommitted
Depend on swift-dependencies (#1808)
Co-authored-by: Brandon Williams <[email protected]> (cherry picked from commit 9b5a510174ba956839035e8254d4be97f0c9ada1) # Conflicts: # .github/workflows/ci.yml # ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved # Examples/TicTacToe/tic-tac-toe/Package.swift # Package.resolved # Package.swift # README.md # Sources/ComposableArchitecture/Effect.swift # Sources/ComposableArchitecture/Effects/ConcurrencySupport.swift # Sources/ComposableArchitecture/Effects/SignalProducer.swift # Sources/Dependencies/Dependencies/MainQueue.swift # Sources/Dependencies/Dependencies/OpenURL.swift # Sources/Dependencies/Dependencies/RandomNumberGenerator.swift # Sources/Dependencies/Dependencies/UUID.swift # Sources/Dependencies/Internal/RuntimeWarnings.swift # Sources/swift-composable-architecture-benchmark/Dependencies.swift # Tests/ComposableArchitectureTests/EffectTests.swift # Tests/DependenciesTests/DependencyKeyTests.swift # Tests/DependenciesTests/DependencyValuesTests.swift
1 parent 226cdd9 commit cca1554

File tree

60 files changed

+947
-3692
lines changed

Some content is hidden

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

60 files changed

+947
-3692
lines changed

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

Lines changed: 119 additions & 103 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/ComposableArchitecture.xcscheme

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,6 @@
3939
ReferencedContainer = "container:">
4040
</BuildableReference>
4141
</TestableReference>
42-
<TestableReference
43-
skipped = "NO">
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "DependenciesTests"
47-
BuildableName = "DependenciesTests"
48-
BlueprintName = "DependenciesTests"
49-
ReferencedContainer = "container:">
50-
</BuildableReference>
51-
</TestableReference>
5242
</Testables>
5343
</TestAction>
5444
<LaunchAction

ComposableArchitecture.xcworkspace/xcshareddata/xcschemes/Dependencies.xcscheme

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

Examples/SpeechRecognition/SpeechRecognition/SpeechClient/Client.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import ComposableArchitecture
21
import Dependencies
32
import Speech
43
import XCTestDynamicOverlay

Examples/TicTacToe/tic-tac-toe/Package.swift

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ let package = Package(
2727
.library(name: "TwoFactorUIKit", targets: ["TwoFactorUIKit"]),
2828
],
2929
dependencies: [
30-
.package(name: "reactiveswift-composable-architecture", path: "../../..")
30+
.package(name: "reactiveswift-composable-architecture", path: "../../.."),
31+
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "0.1.0"),
3132
],
3233
targets: [
3334
.target(
@@ -36,7 +37,7 @@ let package = Package(
3637
"AuthenticationClient",
3738
"LoginCore",
3839
"NewGameCore",
39-
.product(name: "ComposableArchitecture", package: "reactiveswift-composable-architecture"),
40+
.product(name: "Dependencies", package: "swift-dependencies")
4041
]
4142
),
4243
.testTarget(
@@ -63,7 +64,7 @@ let package = Package(
6364
.target(
6465
name: "AuthenticationClient",
6566
dependencies: [
66-
.product(name: "Dependencies", package: "reactiveswift-composable-architecture")
67+
.product(name: "Dependencies", package: "swift-dependencies")
6768
]
6869
),
6970
.target(

Examples/VoiceMemos/VoiceMemos/AudioRecorderClient/AudioRecorderClient.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import ComposableArchitecture // Required for `ActorIsolated`
21
import Dependencies
32
import Foundation
43
import XCTestDynamicOverlay

Examples/VoiceMemos/VoiceMemos/AudioRecorderClient/LiveAudioRecorderClient.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import AVFoundation
2-
import ComposableArchitecture // TODO: Should `UncheckedSendable` live in `Dependencies`?
2+
import Dependencies
33

44
extension AudioRecorderClient: DependencyKey {
55
static var liveValue: Self {

Package.resolved

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)