Update swift-clocks conditional to match (#1561)

stephencelis · web-flow · commit ed3a380f09a8 · 2022-10-24T16:10:09.000-07:00
* Update swift-clocks conditional to match Adopting the same as pointfreeco/swift-clocks#5 * wip * wip * wip
diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Package.resolved b/Package.resolved
diff --git a/Package.swift b/Package.swift
@@ -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"),
diff --git a/Sources/Dependencies/Dependencies/Clocks.swift b/Sources/Dependencies/Dependencies/Clocks.swift
@@ -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, *)
diff --git a/Tests/ComposableArchitectureTests/EffectTests.swift b/Tests/ComposableArchitectureTests/EffectTests.swift
@@ -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()
@@ -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()
diff --git a/Tests/ComposableArchitectureTests/ReducerTests.swift b/Tests/ComposableArchitectureTests/ReducerTests.swift
@@ -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 {

Original file line number	Diff line number	Diff 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))`
`2`	`2`	`import Clocks`
`3`	`3`
`4`	`4`	`@available(iOS 16, macOS 13, tvOS 16, watchOS 9, *)`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ final class ReducerTests: XCTestCase {`
`19`	`19`	`XCTAssertEqual(state, 1)`
`20`	`20`	`}`
`21`	`21`
`22`		`- #if canImport(RoomPlan) \|\| (!canImport(Darwin) && swift(>=5.7))`
	`22`	`+ #if swift(>=5.7) && (canImport(RegexBuilder) \|\| !os(macOS) && !targetEnvironment(macCatalyst))`
`23`	`23`	`func testCombine_EffectsAreMerged() async throws {`
`24`	`24`	`if #available(iOS 16, macOS 13, tvOS 16, watchOS 9, *) {`
`25`	`25`	`enum Action: Equatable {`