Fixes for Xcode 16/Swift 6

strict-concurrency-fix
MFB-Technologies-Inc · Jun 13, 2024 · 5d9085e · 5d9085e
1 parent 10e763b
commit 5d9085e
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 47 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"),
         .enableExperimentalFeature("StrictConcurrency"),
     ]
 }
diff --git a/[email protected] b/[email protected]
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 6.0
 
 import PackageDescription
 
@@ -9,48 +9,37 @@ let package = Package(
         .library(name: "ArgumentEncoding", targets: ["ArgumentEncoding"]),
     ],
     dependencies: [
-        .dependencies,
+        .dependencies(),
     ],
     targets: [
         .target(
             name: "ArgumentEncoding",
             dependencies: [
-                .dependencies,
-            ],
-            swiftSettings: .swiftSix
+                .dependencies(),
+            ]
         ),
         .testTarget(
             name: "ArgumentEncodingTests",
             dependencies: [
                 "ArgumentEncoding",
-            ],
-            swiftSettings: .swiftSix
+            ]
         ),
     ]
 )
 
 // 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")
-}
-
-extension [SwiftSetting] {
-    static let swiftSix: Self = [
-        .enableUpcomingFeature("BareSlashRegexLiterals"),
-        .enableUpcomingFeature("ConciseMagicFile"),
-        .enableUpcomingFeature("DeprecateApplicationMain"),
-        .enableUpcomingFeature("DisableOutwardActorInference"),
-        .enableUpcomingFeature("ForwardTrailingClosures"),
-        .enableUpcomingFeature("ImportObjcForwardDeclarations"),
-        .enableUpcomingFeature("InternalImportsByDefault"),
-        .enableUpcomingFeature("StrictConcurrency"),
-    ]
+    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