Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Strict concurrency fix #13

Merged
merged 3 commits into from
Jun 13, 2024
+79 −23
Merged

Strict concurrency fix #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a07fe2
Fix StrictConcurrency flag in manifest
roanutil Mar 22, 2024
10e763b
Add Swift 6.0 specific manifest for StrictConcurrency flag
roanutil Mar 22, 2024
5d9085e
Fixes for Xcode 16/Swift 6
roanutil Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 12 additions & 15 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ let package = Package(
.library(name: "ArgumentEncoding", targets: ["ArgumentEncoding"]),
],
dependencies: [
.dependencies,
.dependencies(),
],
targets: [
.target(
name: "ArgumentEncoding",
dependencies: [
.dependencies,
.dependencies(),
],
swiftSettings: .swiftSix
),
Expand All @@ -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"),
]
}
45 changes: 45 additions & 0 deletions [email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")
}
}
30 changes: 22 additions & 8 deletions Tests/ArgumentEncodingTests/ArgumentGroupTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading