Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 10 additions & 9 deletions Package-Testing.swift
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,15 @@ let package = Package(
name: "Factory",
targets: ["Factory"]
),
.library(
name: "FactoryTesting",
targets: ["FactoryTesting"]
),
],
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.1.0"),
.package(url: "https://github.com/swiftlang/swift-testing", from: "6.1.0")
],
targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
Expand All @@ -31,24 +36,20 @@ let package = Package(
dependencies: [],
resources: [.copy("PrivacyInfo.xcprivacy")],
swiftSettings: [
// Enable Swift's strict concurrency checker
.unsafeFlags(["-Xfrontend", "-strict-concurrency=complete"], .when(configuration: .debug))
// .unsafeFlags(["-Xfrontend", "-strict-concurrency=complete"], .when(configuration: .debug)),
// .unsafeFlags(["-enable-library-evolution"], .when(configuration: .release))
]
),
.target(
name: "FactoryTesting",
dependencies: ["Factory"]
dependencies: ["Factory", .product(name: "Testing", package: "swift-testing")]
),
.testTarget(
name: "FactoryTests",
dependencies: ["Factory", "FactoryTesting"],
swiftSettings: [
// Enable Swift's strict concurrency checker
.unsafeFlags(["-Xfrontend", "-strict-concurrency=complete"], .when(configuration: .debug))
]
dependencies: ["Factory", "FactoryTesting", .product(name: "Testing", package: "swift-testing")]
)
],
swiftLanguageVersions: [
.version("6")//, .v5
.version("6"), .v5
]
)
18 changes: 18 additions & 0 deletions Package.resolved

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 33 additions & 3 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,30 @@

import PackageDescription

#if swift(<6.0)
private let importOpenSourceSwiftTesting = true
#else
private let importOpenSourceSwiftTesting = false
#endif

/// Only clone swift-testing from Github when Xcode doesn't support necessary features
private func getOpenSourceSwiftTestingPackageDependency() -> [Package.Dependency] {
guard importOpenSourceSwiftTesting else {
return []
}

return [.package(url: "https://github.com/swiftlang/swift-testing", from: "6.1.0")]
}

/// Only link swift-testing from Github when Xcode doesn't support necessary features
private func getOpenSourceSwiftTestingPackageTarget() -> [Target.Dependency] {
guard importOpenSourceSwiftTesting else {
return []
}

return [.product(name: "Testing", package: "swift-testing")]
}

let package = Package(
name: "Factory",
platforms: [
Expand All @@ -26,7 +50,9 @@ let package = Package(
dependencies: [
// Dependencies declare other packages that this package depends on.
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.1.0"),
],

// Only clone swift-testing if required
] + getOpenSourceSwiftTestingPackageDependency(),
Comment on lines +54 to +55
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit Name the func in a way that doesn't require actual comment

Suggested change
// Only clone swift-testing if required
] + getOpenSourceSwiftTestingPackageDependency(),
] + openSourceSwiftTestingDependencyForOlderSwiftVersion(),

targets: [
// Targets are the basic building blocks of a package. A target can define a module or a test suite.
// Targets can depend on other targets in this package, and on products in packages this package depends on.
Expand All @@ -41,11 +67,15 @@ let package = Package(
),
.target(
name: "FactoryTesting",
dependencies: ["Factory"]

// Only link swift-testing if required
dependencies: ["Factory"] + getOpenSourceSwiftTestingPackageTarget()
),
.testTarget(
name: "FactoryTests",
dependencies: ["Factory", "FactoryTesting"]

// Only link swift-testing if required
dependencies: ["Factory", "FactoryTesting"] + getOpenSourceSwiftTestingPackageTarget()
)
],
swiftLanguageVersions: [
Expand Down