Skip to content

Commit ec77158

Browse files
stephencelisp4checo
authored andcommitted
Update swift-clocks conditional to match (#1561)
* Update swift-clocks conditional to match Adopting the same as pointfreeco/swift-clocks#5 * wip * wip * wip (cherry picked from commit ed3a380f09a81e72636d7b0699bf2dd2e6313780) # Conflicts: # Package.resolved # Tests/ComposableArchitectureTests/EffectTests.swift # Tests/ComposableArchitectureTests/ReducerTests.swift
1 parent c9b7f17 commit ec77158

File tree

5 files changed

+418
-418
lines changed

5 files changed

+418
-418
lines changed

ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved

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

Package.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ let package = Package(
2525
.package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
2626
.package(url: "https://github.com/ReactiveCocoa/ReactiveSwift", from: "7.1.0"),
2727
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "0.10.0"),
28-
.package(url: "https://github.com/pointfreeco/swift-clocks", from: "0.1.1"),
28+
.package(url: "https://github.com/pointfreeco/swift-clocks", from: "0.1.4"),
2929
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.6.0"),
3030
.package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "0.4.1"),
3131
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.5.0"),

Sources/Dependencies/Dependencies/Clocks.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#if canImport(RoomPlan) || (!canImport(Darwin) && swift(>=5.7))
1+
#if swift(>=5.7) && (canImport(RegexBuilder) || !os(macOS) && !targetEnvironment(macCatalyst))
22
import Clocks
33

44
@available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)

0 commit comments

Comments
 (0)