MFB-Technologies-Inc · r-jarvis · Apr 21, 2025 · Apr 18, 2025 · Apr 18, 2025 · Apr 18, 2025
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -1,44 +1,38 @@
 {
-	"name": "swift-argument-encoding",
-    "image": "swift:5.7",
-    "features": {
-        "ghcr.io/devcontainers/features/common-utils:2": {
-            "installZsh": "false",
-            "username": "vscode",
-            "userUid": "1000",
-            "userGid": "1000",
-            "upgradePackages": "false"
-        },
-        "ghcr.io/devcontainers/features/git:1": {
-            "version": "os-provided",
-            "ppa": "false"
-        }
+  "name": "swift-argument-encoding",
+  "image": "swift:5.8",
+  "features": {
+    "ghcr.io/devcontainers/features/common-utils:2": {
+      "installZsh": "false",
+      "username": "vscode",
+      "userUid": "1000",
+      "userGid": "1000",
+      "upgradePackages": "false"
     },
-    "runArgs": [
-        "--cap-add=SYS_PTRACE",
-        "--security-opt",
-        "seccomp=unconfined"
-    ],
-    // Configure tool-specific properties.
-    "customizations": {
-        // Configure properties specific to VS Code.
-        "vscode": {
-            // Set *default* container specific settings.json values on container create.
-            "settings": {
-                "lldb.library": "/usr/lib/liblldb.so"
-            },
-            // Add the IDs of extensions you want installed when the container is created.
-            "extensions": [
-                "sswg.swift-lang"
-            ]
-        }
-    },
-    // Use 'forwardPorts' to make a list of ports inside the container available locally.
-    // "forwardPorts": [],
+    "ghcr.io/devcontainers/features/git:1": {
+      "version": "os-provided",
+      "ppa": "false"
+    }
+  },
+  "runArgs": ["--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
+  // Configure tool-specific properties.
+  "customizations": {
+    // Configure properties specific to VS Code.
+    "vscode": {
+      // Set *default* container specific settings.json values on container create.
+      "settings": {
+        "lldb.library": "/usr/lib/liblldb.so"
+      },
+      // Add the IDs of extensions you want installed when the container is created.
+      "extensions": ["swiftlang.swift-vscode"]
+    }
+  },
+  // Use 'forwardPorts' to make a list of ports inside the container available locally.
+  // "forwardPorts": [],
 
-    // Use 'postCreateCommand' to run commands after the container is created.
-    "postCreateCommand": "swift --version",
+  // Use 'postCreateCommand' to run commands after the container is created.
+  "postCreateCommand": "swift --version",
 
-    // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-    "remoteUser": "vscode"
+  // Set `remoteUser` to `root` to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+  "remoteUser": "vscode"
 }
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,34 +11,30 @@ on:
 
 jobs:
   lint:
-    runs-on: macos-13
+    runs-on: macos-latest
     environment: default
     steps:
       - uses: actions/checkout@v4
       - name: SwiftFormat version
         run: swiftformat --version
       - name: Format lint
         run: swiftformat --lint .
+      - name: Install SwiftLint
+        run: brew install swiftlint
       - name: SwiftLint version
         run: swiftlint --version
       - name: Lint
         run: swiftlint lint --quiet
   macos-test:
-    runs-on: macos-13
+    runs-on: macos-latest
     environment: default
-    strategy:
-      matrix:
-        xcode: ["14.3", "15.0"]
-        # Swift: 5.8  , 5.9
     steps:
       - uses: actions/checkout@v4
-      - name: Select Xcode ${{ matrix.xcode }}
-        run: sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode }}.app
       - name: Run Tests
         run: swift test --enable-code-coverage --parallel
       - name: Swift Coverage Report
         run: xcrun llvm-cov export -format="lcov" .build/debug/swift-argument-encodingPackageTests.xctest/Contents/MacOS/swift-argument-encodingPackageTests -instr-profile .build/debug/codecov/default.profdata > coverage_report.lcov
-      - uses: codecov/codecov-action@v4
+      - uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           fail_ci_if_error: true # optional (default = false)
@@ -47,6 +43,6 @@ jobs:
     environment: default
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Run Tests
         run: swift test --parallel
diff --git a/.swiftformat b/.swiftformat
@@ -2,8 +2,8 @@
 --redundanttype explicit
 --swiftversion 5.8
 --maxwidth 120
---header "{file}\nArgumentEncoding\n\nCopyright © {year} MFB Technologies, Inc. All rights reserved.\n\nThis source code is licensed under the MIT license found in the\nLICENSE file in the root directory of this source tree."
+--header "{file}\nArgumentEncoding\n\nThis source code is licensed under the MIT License (MIT) found in the\nLICENSE file in the root directory of this source tree."
 --allman false
 --exclude **/output/**/*,.tuist-bin,**/.swiftpm/*,**/.build/*
 --wraparguments before-first
---wrapcollections before-first
+--wrapcollections before-first
diff --git a/Examples/Sources/SwiftCommand/RunCommand.swift b/Examples/Sources/SwiftCommand/RunCommand.swift
@@ -1,9 +1,7 @@
 // RunCommand.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import ArgumentEncoding

diff --git a/Examples/Sources/SwiftCommand/SwiftCommand.swift b/Examples/Sources/SwiftCommand/SwiftCommand.swift
@@ -1,9 +1,7 @@
 // SwiftCommand.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import ArgumentEncoding

diff --git a/Examples/Sources/SwiftCommand/TestCommand.swift b/Examples/Sources/SwiftCommand/TestCommand.swift
@@ -1,9 +1,7 @@
 // TestCommand.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import ArgumentEncoding

diff --git a/Examples/Sources/SwiftCommand/main.swift b/Examples/Sources/SwiftCommand/main.swift
@@ -1,9 +1,7 @@
 // main.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 let test = SwiftCommand.test(TestCommand(

diff --git a/Sources/ArgumentEncoding/ArgumentGroup.swift b/Sources/ArgumentEncoding/ArgumentGroup.swift
@@ -1,9 +1,7 @@
 // ArgumentGroup.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Dependencies

diff --git a/Sources/ArgumentEncoding/CaseConverter.swift b/Sources/ArgumentEncoding/CaseConverter.swift
@@ -1,9 +1,7 @@
 // CaseConverter.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Foundation

diff --git a/Sources/ArgumentEncoding/Command.swift b/Sources/ArgumentEncoding/Command.swift
@@ -1,9 +1,7 @@
 // Command.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 /// A command type argument with no nested or children arguments.

diff --git a/Sources/ArgumentEncoding/CommandRepresentable.swift b/Sources/ArgumentEncoding/CommandRepresentable.swift
@@ -1,9 +1,7 @@
 // CommandRepresentable.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Dependencies

diff --git a/Sources/ArgumentEncoding/DecoderUserInfo+OptionHelpers.swift b/Sources/ArgumentEncoding/DecoderUserInfo+OptionHelpers.swift
@@ -1,9 +1,7 @@
 // DecoderUserInfo+OptionHelpers.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Foundation

diff --git a/Sources/ArgumentEncoding/DecoderUserInfo+OptionSetHelpers.swift b/Sources/ArgumentEncoding/DecoderUserInfo+OptionSetHelpers.swift
@@ -1,9 +1,7 @@
 // DecoderUserInfo+OptionSetHelpers.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Foundation

diff --git a/Sources/ArgumentEncoding/Flag.swift b/Sources/ArgumentEncoding/Flag.swift
@@ -1,9 +1,7 @@
 // Flag.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Dependencies

diff --git a/Sources/ArgumentEncoding/FormatterNode.swift b/Sources/ArgumentEncoding/FormatterNode.swift
@@ -1,9 +1,7 @@
 // FormatterNode.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 /// A protocol that describes a type that defines how flags and options are formatted. Typically, `ArgumentGroup`

diff --git a/Sources/ArgumentEncoding/Formatters.swift b/Sources/ArgumentEncoding/Formatters.swift
@@ -1,9 +1,7 @@
 // Formatters.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Dependencies

diff --git a/Sources/ArgumentEncoding/Option.swift b/Sources/ArgumentEncoding/Option.swift
@@ -1,9 +1,7 @@
 // Option.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Dependencies

diff --git a/Sources/ArgumentEncoding/OptionSet.swift b/Sources/ArgumentEncoding/OptionSet.swift
@@ -1,9 +1,7 @@
 // OptionSet.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Dependencies

diff --git a/Sources/ArgumentEncoding/PositionalArgument.swift b/Sources/ArgumentEncoding/PositionalArgument.swift
@@ -1,9 +1,7 @@
 // PositionalArgument.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import Foundation

diff --git a/Sources/ArgumentEncoding/StaticString+Constants.swift b/Sources/ArgumentEncoding/StaticString+Constants.swift
@@ -1,9 +1,7 @@
 // StaticString+Constants.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 extension StaticString {

diff --git a/Sources/ArgumentEncoding/TopLevelCommandRepresentable.swift b/Sources/ArgumentEncoding/TopLevelCommandRepresentable.swift
@@ -1,9 +1,7 @@
 // TopLevelCommandRepresentable.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 /// A type that represents a command type argument that is not a child of an `ArgumentGroup`.

diff --git a/Tests/ArgumentEncodingTests/ArgumentGroupTests.swift b/Tests/ArgumentEncodingTests/ArgumentGroupTests.swift
@@ -1,9 +1,7 @@
 // ArgumentGroupTests.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import ArgumentEncoding
@@ -250,28 +248,14 @@ final class ArgumentGroupTests: XCTestCase {
     }
 }
 
-#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) }
-    }
-
-    extension Dictionary: @retroactive ArgumentGroup, @retroactive FormatterNode {
-        public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
-
-        public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
-    }
-#else
-    extension Array: ArgumentGroup, FormatterNode {
-        public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
+extension Array: ArgumentGroup, 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: ArgumentGroup, FormatterNode {
+    public var flagFormatter: ArgumentEncoding.FlagFormatter { FlagFormatter(prefix: .doubleDash) }
 
-        public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
-    }
-#endif
+    public var optionFormatter: ArgumentEncoding.OptionFormatter { OptionFormatter(prefix: .doubleDash) }
+}
diff --git a/Tests/ArgumentEncodingTests/CommandRepresentableTests.swift b/Tests/ArgumentEncodingTests/CommandRepresentableTests.swift
@@ -1,9 +1,7 @@
 // CommandRepresentableTests.swift
 // ArgumentEncoding
 //
-// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
-//
-// This source code is licensed under the MIT license found in the
+// This source code is licensed under the MIT License (MIT) found in the
 // LICENSE file in the root directory of this source tree.
 
 import ArgumentEncoding