Merge pull request #13 from MFB-Technologies-Inc/strict-concurrency-fix

Strict concurrency fix
MFB-Technologies-Inc · Jun 13, 2024 · ff55e8b · ff55e8b
2 parents 98f9fd9 + 5d9085e
commit ff55e8b
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 23 deletions.
diff --git a/Package.swift b/Package.swift
@@ -9,13 +9,13 @@ let package = Package(
         .library(name: "ArgumentEncoding", targets: ["ArgumentEncoding"]),
     ],
     dependencies: [
-        .dependencies,
+        .dependencies(),
     ],
     targets: [
         .target(
             name: "ArgumentEncoding",
             dependencies: [
-                .dependencies,
+                .dependencies(),
             ],
             swiftSettings: .swiftSix
         ),
@@ -32,25 +32,22 @@ let package = Package(
 // MARK: PointFree
 
 extension Package.Dependency {
-    static let dependencies: Package.Dependency = .package(
-        url: "https://github.com/pointfreeco/swift-dependencies.git",
-        .upToNextMajor(from: "1.0.0")
-    )
+    static func dependencies() -> Package.Dependency {
+        .package(
+            url: "https://github.com/pointfreeco/swift-dependencies.git",
+            .upToNextMajor(from: "1.0.0")
+        )
+    }
 }
 
 extension Target.Dependency {
-    static let dependencies: Self = .product(name: "Dependencies", package: "swift-dependencies")
+    static func dependencies() -> Self {
+        .product(name: "Dependencies", package: "swift-dependencies")
+    }
 }
 
 extension [SwiftSetting] {
     static let swiftSix: Self = [
-        .enableUpcomingFeature("BareSlashRegexLiterals"),
-        .enableUpcomingFeature("ConciseMagicFile"),
-        .enableUpcomingFeature("DeprecateApplicationMain"),
-        .enableUpcomingFeature("DisableOutwardActorInference"),
-        .enableUpcomingFeature("ForwardTrailingClosures"),
-        .enableUpcomingFeature("ImportObjcForwardDeclarations"),
-        .enableUpcomingFeature("InternalImportsByDefault"),
-        .enableUpcomingFeature("StrictConcurrency"),
+        .enableExperimentalFeature("StrictConcurrency"),
     ]
 }
diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift
@@ -0,0 +1,45 @@
+// swift-tools-version: 6.0
+
+import PackageDescription
+
+let package = Package(
+    name: "swift-argument-encoding",
+    platforms: [.macOS(.v12)],
+    products: [
+        .library(name: "ArgumentEncoding", targets: ["ArgumentEncoding"]),
+    ],
+    dependencies: [
+        .dependencies(),
+    ],
+    targets: [
+        .target(
+            name: "ArgumentEncoding",
+            dependencies: [
+                .dependencies(),
+            ]
+        ),
+        .testTarget(
+            name: "ArgumentEncodingTests",
+            dependencies: [
+                "ArgumentEncoding",
+            ]
+        ),
+    ]
+)
+
+// MARK: PointFree
+
+extension Package.Dependency {
+    static func dependencies() -> Package.Dependency {
+        .package(
+            url: "https://github.com/pointfreeco/swift-dependencies.git",
+            .upToNextMajor(from: "1.0.0")
+        )
+    }
+}
+
+extension Target.Dependency {
+    static func dependencies() -> Self {
+        .product(name: "Dependencies", package: "swift-dependencies")
+    }
+}
diff --git a/Tests/ArgumentEncodingTests/ArgumentGroupTests.swift b/Tests/ArgumentEncodingTests/ArgumentGroupTests.swift
@@ -250,14 +250,28 @@ final class ArgumentGroupTests: XCTestCase {
     }
 }
 
-extension Array: ArgumentGroup, FormatterNode {
-    public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
+#if swift(>=6)
+    extension Array: @retroactive ArgumentGroup, @retroactive FormatterNode {
+        public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
 
-    public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
-}
+        public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
+    }
 
-extension Dictionary: ArgumentGroup, FormatterNode {
-    public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
+    extension Dictionary: @retroactive ArgumentGroup, @retroactive FormatterNode {
+        public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
 
-    public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
-}
+        public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
+    }
+#else
+    extension Array: ArgumentGroup, FormatterNode {
+        public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
+
+        public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
+    }
+
+    extension Dictionary: ArgumentGroup, FormatterNode {
+        public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
+
+        public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
+    }
+#endif