Skip to content

Commit

Permalink
Merge pull request #11 from MFB-Technologies-Inc/strict-concurrency
Browse files Browse the repository at this point in the history
Strict concurrency
  • Loading branch information
r-jarvis authored Feb 13, 2024
2 parents ee02af2 + 903e208 commit f5a0682
Show file tree
Hide file tree
Showing 32 changed files with 50 additions and 35 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ jobs:
environment: default
strategy:
matrix:
xcode: ['14.2', '14.3']
# Swift: 5.7 , 5.8
xcode: ['14.3', '15.0']
# Swift: 5.8 , 5.9
steps:
- uses: actions/checkout@v3
- name: Select Xcode ${{ matrix.xcode }}
Expand Down
2 changes: 1 addition & 1 deletion .swiftformat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--extensionacl on-declarations
--redundanttype explicit
--swiftversion 5.7
--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."
--allman false
Expand Down
2 changes: 1 addition & 1 deletion Examples/Sources/SwiftCommand/RunCommand.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// RunCommand.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Examples/Sources/SwiftCommand/SwiftCommand.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// SwiftCommand.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Examples/Sources/SwiftCommand/TestCommand.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// TestCommand.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Examples/Sources/SwiftCommand/main.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// main.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
21 changes: 18 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version: 5.7
// swift-tools-version: 5.8

import PackageDescription

Expand All @@ -16,13 +16,15 @@ let package = Package(
name: "ArgumentEncoding",
dependencies: [
.dependencies,
]
],
swiftSettings: .swiftSix
),
.testTarget(
name: "ArgumentEncodingTests",
dependencies: [
"ArgumentEncoding",
]
],
swiftSettings: .swiftSix
),
]
)
Expand All @@ -39,3 +41,16 @@ extension Package.Dependency {
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"),
]
}
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/ArgumentGroup.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ArgumentGroup.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/CaseConverter.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// CaseConverter.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/Command.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Command.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/CommandRepresentable.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// CommandRepresentable.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// DecoderUserInfo+OptionHelpers.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// DecoderUserInfo+OptionSetHelpers.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/Flag.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Flag.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/FormatterNode.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// FormatterNode.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/Formatters.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Formatters.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/Option.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Option.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/OptionSet.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// OptionSet.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/PositionalArgument.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// PositionalArgument.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Sources/ArgumentEncoding/StaticString+Constants.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// StaticString+Constants.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// TopLevelCommandRepresentable.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/ArgumentGroupTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// ArgumentGroupTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// CommandRepresentableTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/CommandTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// CommandTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/FlagTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// FlagTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/FormatterTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// FormatterTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/OptionDecodingTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// OptionDecodingTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/OptionSetDecodingTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// OptionSetDecodingTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/OptionSetTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// OptionSetTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/OptionTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// OptionTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
2 changes: 1 addition & 1 deletion Tests/ArgumentEncodingTests/PositionalTests.swift
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// PositionalTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// TopLevelCommandRepresentableTests.swift
// ArgumentEncoding
//
// Copyright © 2023 MFB Technologies, Inc. All rights reserved.
// Copyright © 2024 MFB Technologies, Inc. All rights reserved.
//
// This source code is licensed under the MIT license found in the
// LICENSE file in the root directory of this source tree.
Expand Down

0 comments on commit f5a0682

Please sign in to comment.