chore: swaps @swift files around

danthorpe · Sep 24, 2024 · 0858896 · 0858896
1 parent b467097
commit 0858896
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 34 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,5 +1,5 @@
-// swift-tools-version: 6.0
-@preconcurrency import PackageDescription
+// swift-tools-version: 5.9
+import PackageDescription
 
 var package = Package(
   name: "swift-composable-loadable",
@@ -14,32 +14,31 @@ var package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
-    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.15.0"),
+    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", exact: "1.14.0"),
   ],
   targets: [
     .target(
       name: "ComposableLoadable",
       dependencies: [
-        .product(
-          name: "ComposableArchitecture", package: "swift-composable-architecture"
-        )
-      ]
+        .composableArchitecture
+      ],
+      swiftSettings: .concurrency
     ),
     .target(
       name: "CommonTestHelpers",
       dependencies: [
         "ComposableLoadable",
-        .product(
-          name: "ComposableArchitecture", package: "swift-composable-architecture"
-        ),
-      ]
+        .composableArchitecture,
+      ],
+      swiftSettings: .concurrency
     ),
     .testTarget(
       name: "ComposableLoadableTests",
       dependencies: [
         "CommonTestHelpers",
         "ComposableLoadable",
-      ]
+      ],
+      swiftSettings: .concurrency
     ),
   ]
 )
@@ -51,8 +50,15 @@ extension Target.Dependency {
 }
 
 extension [SwiftSetting] {
+  #if compiler(>=6)
   static let concurrency: Self = [
-    .enableUpcomingFeature("StrictConcurrency"),
-    .enableUpcomingFeature("InferSendableFromCaptures"),
+    .enableUpcomingFeature("StrictConcurrency")
+      .enableUpcomingFeature("InferSendableFromCaptures")
   ]
+  #else
+  static let concurrency: Self = [
+    .enableExperimentalFeature("StrictConcurrency"),
+    .enableExperimentalFeature("InferSendableFromCaptures"),
+  ]
+  #endif
 }
diff --git a/[email protected] → [email protected] b/[email protected] → [email protected]
@@ -1,5 +1,5 @@
-// swift-tools-version: 5.9
-import PackageDescription
+// swift-tools-version: 6.0
+@preconcurrency import PackageDescription
 
 var package = Package(
   name: "swift-composable-loadable",
@@ -14,31 +14,32 @@ var package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.3.0"),
-    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", exact: "1.14.0"),
+    .package(url: "https://github.com/pointfreeco/swift-composable-architecture", from: "1.15.0"),
   ],
   targets: [
     .target(
       name: "ComposableLoadable",
       dependencies: [
-        .composableArchitecture
-      ],
-      swiftSettings: .concurrency
+        .product(
+          name: "ComposableArchitecture", package: "swift-composable-architecture"
+        )
+      ]
     ),
     .target(
       name: "CommonTestHelpers",
       dependencies: [
         "ComposableLoadable",
-        .composableArchitecture,
-      ],
-      swiftSettings: .concurrency
+        .product(
+          name: "ComposableArchitecture", package: "swift-composable-architecture"
+        ),
+      ]
     ),
     .testTarget(
       name: "ComposableLoadableTests",
       dependencies: [
         "CommonTestHelpers",
         "ComposableLoadable",
-      ],
-      swiftSettings: .concurrency
+      ]
     ),
   ]
 )
@@ -50,15 +51,8 @@ extension Target.Dependency {
 }
 
 extension [SwiftSetting] {
-  #if compiler(>=6)
   static let concurrency: Self = [
-    .enableUpcomingFeature("StrictConcurrency")
-    .enableUpcomingFeature("InferSendableFromCaptures")
+    .enableUpcomingFeature("StrictConcurrency"),
+    .enableUpcomingFeature("InferSendableFromCaptures"),
   ]
-  #else
-  static let concurrency: Self = [
-    .enableExperimentalFeature("StrictConcurrency"),
-    .enableExperimentalFeature("InferSendableFromCaptures"),
-  ]
-  #endif
 }