Rework validation import conditions to dependency conditionals

Author: phausler

Package.swift

@@ -3,28 +3,13 @@
 import PackageDescription
 import CompilerPluginSupport
 
-// Availability Macros
-
-let supportedTestingPlatforms: [Platform] = [
-  .macOS,
-  .iOS,
-  .tvOS,
-  .watchOS,
-  .visionOS,
-  .macCatalyst,
-  .android,
-  .linux,
-  .openbsd,
-  .wasi,
-]
-
 let availabilityMacros: [SwiftSetting] = [
   .enableExperimentalFeature(
     "AvailabilityMacro=AsyncAlgorithms 1.0:macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0"
   ),
   .enableExperimentalFeature(
     "AvailabilityMacro=AsyncAlgorithms 1.1:macOS 15.0, iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0"
-  ),
+  )
 ]
 
 let package = Package(
@@ -56,17 +41,41 @@ let package = Package(
       dependencies: ["AsyncAlgorithms", "AsyncSequenceValidation"],
       swiftSettings: availabilityMacros + [
         .enableExperimentalFeature("StrictConcurrency=complete")
-      ],
-      condition: .when(platforms: supportedTestingPlatforms)
+      ]
     ),
     .testTarget(
       name: "AsyncAlgorithmsTests",
-      dependencies: ["AsyncAlgorithms", "AsyncSequenceValidation", "AsyncAlgorithms_XCTest"],
+      dependencies: [
+        .target(name: "AsyncAlgorithms"),
+        .target(name: "AsyncSequenceValidation", condition: .when(platforms: [
+          .macOS,
+          .iOS,
+          .tvOS,
+          .watchOS,
+          .visionOS,
+          .macCatalyst,
+          .android,
+          .linux,
+          .openbsd,
+          .wasi
+        ])),
+        .target(name: "AsyncAlgorithms_XCTest", condition: .when(platforms: [
+          .macOS,
+          .iOS,
+          .tvOS,
+          .watchOS,
+          .visionOS,
+          .macCatalyst,
+          .android,
+          .linux,
+          .openbsd,
+          .wasi
+        ]))
+      ],
       swiftSettings: availabilityMacros + [
         .enableExperimentalFeature("StrictConcurrency=complete")
-      ],
-      condition: .when(platforms: supportedTestingPlatforms)
-    ),
+      ]
+    )
   ]
 )
 

[email protected]

@@ -6,8 +6,12 @@ import CompilerPluginSupport
 // Availability Macros
 
 let availabilityMacros: [SwiftSetting] = [
-  .enableExperimentalFeature("AvailabilityMacro=AsyncAlgorithms 1.0:macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0"),
-  .enableExperimentalFeature("AvailabilityMacro=AsyncAlgorithms 1.1:macOS 15.0, iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0"),
+  .enableExperimentalFeature(
+    "AvailabilityMacro=AsyncAlgorithms 1.0:macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 6.0"
+  ),
+  .enableExperimentalFeature(
+    "AvailabilityMacro=AsyncAlgorithms 1.1:macOS 15.0, iOS 18.0, tvOS 18.0, watchOS 11.0, visionOS 2.0"
+  ),
 ]
 
 let package = Package(
@@ -43,7 +47,33 @@ let package = Package(
     ),
     .testTarget(
       name: "AsyncAlgorithmsTests",
-      dependencies: ["AsyncAlgorithms", "AsyncSequenceValidation", "AsyncAlgorithms_XCTest"],
+      dependencies: [
+        .target(name: "AsyncAlgorithms"),
+        .target(name: "AsyncSequenceValidation", condition: .when(platforms: [
+          .macOS,
+          .iOS,
+          .tvOS,
+          .watchOS,
+          .visionOS,
+          .macCatalyst,
+          .android,
+          .linux,
+          .openbsd,
+          .wasi
+        ])),
+        .target(name: "AsyncAlgorithms_XCTest", condition: .when(platforms: [
+          .macOS,
+          .iOS,
+          .tvOS,
+          .watchOS,
+          .visionOS,
+          .macCatalyst,
+          .android,
+          .linux,
+          .openbsd,
+          .wasi
+        ]))
+      ],
       swiftSettings: availabilityMacros + [
         .enableExperimentalFeature("StrictConcurrency=complete")
       ]
@@ -53,7 +83,7 @@ let package = Package(
 
 if Context.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
   package.dependencies += [
-    .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0"),
+    .package(url: "https://github.com/apple/swift-collections.git", from: "1.1.0")
   ]
 } else {
   package.dependencies += [

Tests/AsyncAlgorithmsTests/TestChunk.swift

@@ -10,6 +10,9 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
+
+#if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
+
 import AsyncSequenceValidation
 import AsyncAlgorithms
 
@@ -334,3 +337,5 @@ final class TestChunk: XCTestCase {
     }
   }
 }
+
+#endif

Tests/AsyncAlgorithmsTests/TestTimer.swift

@@ -10,6 +10,9 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
+
+#if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
+
 import AsyncAlgorithms
 import AsyncSequenceValidation
 
@@ -57,3 +60,5 @@ final class TestTimer: XCTestCase {
     }
   }
 }
+
+#endif

Tests/AsyncAlgorithmsTests/TestValidationTests.swift

@@ -10,6 +10,9 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
+
+#if canImport(Darwin) || canImport(Glibc) || canImport(Musl) || canImport(Bionic) || canImport(wasi_pthread)
+
 import AsyncAlgorithms
 import AsyncSequenceValidation
 @testable import AsyncAlgorithms_XCTest
@@ -354,3 +357,5 @@ struct LaggingAsyncSequence<Base: AsyncSequence, C: Clock>: AsyncSequence {
     self.clock = clock
   }
 }
+
+#endif