Skip to content

Update swift-clocks conditional to match #1561

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Oct 24, 2022
Merged

Update swift-clocks conditional to match #1561

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a5fa7ac
Update swift-clocks conditional to match
stephencelis Oct 24, 2022
05f1b96
wip
stephencelis Oct 24, 2022
06219fb
wip
stephencelis Oct 24, 2022
b27b9bf
wip
stephencelis Oct 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Package.resolved
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ let package = Package(
.package(url: "https://github.com/google/swift-benchmark", from: "0.1.0"),
.package(url: "https://github.com/pointfreeco/combine-schedulers", from: "0.8.0"),
.package(url: "https://github.com/pointfreeco/swift-case-paths", from: "0.10.0"),
.package(url: "https://github.com/pointfreeco/swift-clocks", from: "0.1.1"),
.package(url: "https://github.com/pointfreeco/swift-clocks", from: "0.1.4"),
.package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "0.6.0"),
.package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "0.4.1"),
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "0.5.0"),
Expand Down
2 changes: 1 addition & 1 deletion Sources/Dependencies/Dependencies/Clocks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#if canImport(RoomPlan) || (!canImport(Darwin) && swift(>=5.7))
#if swift(>=5.7) && (canImport(RegexBuilder) || !os(macOS) && !targetEnvironment(macCatalyst))
import Clocks

@available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)
Expand Down
4 changes: 2 additions & 2 deletions Tests/ComposableArchitectureTests/EffectTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ final class EffectTests: XCTestCase {
.store(in: &self.cancellables)
}

#if canImport(RoomPlan) || (!canImport(Darwin) && swift(>=5.7))
#if swift(>=5.7) && (canImport(RegexBuilder) || !os(macOS) && !targetEnvironment(macCatalyst))
func testConcatenate() async {
if #available(iOS 16, macOS 13, tvOS 16, watchOS 9, *) {
let clock = TestClock()
Expand Down Expand Up @@ -102,7 +102,7 @@ final class EffectTests: XCTestCase {
XCTAssertEqual(values, [1])
}

#if canImport(RoomPlan) || (!canImport(Darwin) && swift(>=5.7))
#if swift(>=5.7) && (canImport(RegexBuilder) || !os(macOS) && !targetEnvironment(macCatalyst))
func testMerge() async {
if #available(iOS 16, macOS 13, tvOS 16, watchOS 9, *) {
let clock = TestClock()
Expand Down
2 changes: 1 addition & 1 deletion Tests/ComposableArchitectureTests/ReducerTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ final class ReducerTests: XCTestCase {
XCTAssertEqual(state, 1)
}

#if canImport(RoomPlan) || (!canImport(Darwin) && swift(>=5.7))
#if swift(>=5.7) && (canImport(RegexBuilder) || !os(macOS) && !targetEnvironment(macCatalyst))
func testCombine_EffectsAreMerged() async throws {
if #available(iOS 16, macOS 13, tvOS 16, watchOS 9, *) {
enum Action: Equatable {
Expand Down