Merge pull request #119 from swhitty/swhitty-patch-1

Author: swhitty

.github/workflows/build.yml

@@ -85,7 +85,7 @@ jobs:
 
   linux_swift_6_0:
     runs-on: ubuntu-latest
-    container: swiftlang/swift:nightly-jammy
+    container: swift:6.0
     steps:
       - name: Checkout
         uses: actions/checkout@v4

Package.swift

@@ -31,10 +31,28 @@ let package = Package(
             swiftSettings: .upcomingFeatures
         ),
         .target(
-             name: "CSystemLinux",
-             path: "CSystemLinux"
+            name: "CSystemLinux",
+            path: "CSystemLinux"
+        ),
+        .testTarget(
+            name: "FlyingFoxTests",
+            dependencies: ["FlyingFox"],
+            path: "FlyingFox/Tests",
+            resources: [
+               .copy("Stubs")
+            ],
+            swiftSettings: .upcomingFeatures
+        ),
+        .testTarget(
+            name: "FlyingSocksTests",
+            dependencies: ["FlyingSocks"],
+            path: "FlyingSocks/Tests",
+            resources: [
+               .copy("Resources")
+            ],
+            swiftSettings: .upcomingFeatures
         )
-    ] + .testingTargets
+    ]
 )
 
 extension Array where Element == SwiftSetting {
@@ -46,51 +64,3 @@ extension Array where Element == SwiftSetting {
         ]
     }
 }
-
-extension [PackageDescription.Target] {
-    static var testingTargets: [PackageDescription.Target] {
-    #if canImport(Darwin) || compiler(>=6.1)
-        [
-            .testTarget(
-                name: "FlyingFoxTests",
-                dependencies: ["FlyingFox"],
-                path: "FlyingFox/Tests",
-                resources: [
-                    .copy("Stubs")
-                ],
-                swiftSettings: .upcomingFeatures
-            ),
-            .testTarget(
-                name: "FlyingSocksTests",
-                dependencies: ["FlyingSocks"],
-                path: "FlyingSocks/Tests",
-                resources: [
-                    .copy("Resources")
-                ],
-                swiftSettings: .upcomingFeatures
-            )
-        ]
-        #else
-        [
-            .testTarget(
-                name: "FlyingFoxXCTests",
-                dependencies: ["FlyingFox"],
-                path: "FlyingFox/XCTests",
-                resources: [
-                    .copy("Stubs")
-                ],
-                swiftSettings: .upcomingFeatures
-            ),
-            .testTarget(
-                name: "FlyingSocksXCTests",
-                dependencies: ["FlyingSocks"],
-                path: "FlyingSocks/XCTests",
-                resources: [
-                    .copy("Resources")
-                ],
-                swiftSettings: .upcomingFeatures
-            )
-        ]
-        #endif
-    }
-}