Skip to content

Swap Package Manifest Files #756

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

Merged
merged 1 commit into from
Jul 14, 2021
Merged

Swap Package Manifest Files #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
50 changes: 15 additions & 35 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
// swift-tools-version:5.5
// In order to support users running on legacy Xcodes, please ensure that
// Package@swift-5.4.swift is kept in sync with this file.
// swift-tools-version:5.1
// In order to support users running on the latest Xcodes, please ensure that
// Package@swift-5.5.swift is kept in sync with this file.
import PackageDescription
import class Foundation.ProcessInfo

Expand Down Expand Up @@ -43,26 +43,18 @@ let package = Package(
targets: [

/// C modules wrapper for _InternalLibSwiftScan.
.target(name: "CSwiftScan",
exclude: [ "CMakeLists.txt" ]),
.target(name: "CSwiftScan"),

/// The driver library.
.target(
name: "SwiftDriver",
dependencies: [
"SwiftOptions",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
"CSwiftScan",
.product(name: "Yams", package: "Yams"),
]),
dependencies: ["SwiftOptions", "SwiftToolsSupport-auto",
"CSwiftScan", "Yams"]),

/// The execution library.
.target(
name: "SwiftDriverExecution",
dependencies: [
"SwiftDriver",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core")
]),
dependencies: ["SwiftDriver", "SwiftToolsSupport-auto"]),

/// Driver tests.
.testTarget(
Expand All @@ -73,11 +65,7 @@ let package = Package(
/// IncrementalImport tests
.testTarget(
name: "IncrementalImportTests",
dependencies: [
"IncrementalTestFramework",
"TestUtilities",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
]),
dependencies: ["IncrementalTestFramework", "TestUtilities", "SwiftToolsSupport-auto"]),

.target(
name: "IncrementalTestFramework",
Expand All @@ -95,34 +83,28 @@ let package = Package(
/// The options library.
.target(
name: "SwiftOptions",
dependencies: [
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
]),
dependencies: ["SwiftToolsSupport-auto"]),
.testTarget(
name: "SwiftOptionsTests",
dependencies: ["SwiftOptions"]),

/// The primary driver executable.
.executableTarget(
.target(
name: "swift-driver",
dependencies: ["SwiftDriverExecution", "SwiftDriver"]),

/// The help executable.
.executableTarget(
.target(
name: "swift-help",
dependencies: [
"SwiftOptions",
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
]),
dependencies: ["SwiftOptions", "ArgumentParser", "SwiftToolsSupport-auto"]),

/// The help executable.
.executableTarget(
.target(
name: "swift-build-sdk-interfaces",
dependencies: ["SwiftDriver", "SwiftDriverExecution"]),

/// The `makeOptions` utility (for importing option definitions).
.executableTarget(
.target(
name: "makeOptions",
dependencies: []),
],
Expand All @@ -141,9 +123,7 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
.package(path: "../llbuild"),
]
}
package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [
.product(name: "llbuildSwift", package: "swift-llbuild"),
]
package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += ["llbuildSwift"]
}

if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
Expand Down
48 changes: 34 additions & 14 deletions [email protected] → [email protected]
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// swift-tools-version:5.1
// In order to support users running on the latest Xcodes, please ensure that
// swift-tools-version:5.5
// In order to support users running on legacy Xcodes, please ensure that
// Package.swift is kept in sync with this file.
import PackageDescription
import class Foundation.ProcessInfo
Expand Down Expand Up @@ -43,18 +43,26 @@ let package = Package(
targets: [

/// C modules wrapper for _InternalLibSwiftScan.
.target(name: "CSwiftScan"),
.target(name: "CSwiftScan",
exclude: [ "CMakeLists.txt" ]),

/// The driver library.
.target(
name: "SwiftDriver",
dependencies: ["SwiftOptions", "SwiftToolsSupport-auto",
"CSwiftScan", "Yams"]),
dependencies: [
"SwiftOptions",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
"CSwiftScan",
.product(name: "Yams", package: "Yams"),
]),

/// The execution library.
.target(
name: "SwiftDriverExecution",
dependencies: ["SwiftDriver", "SwiftToolsSupport-auto"]),
dependencies: [
"SwiftDriver",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core")
]),

/// Driver tests.
.testTarget(
Expand All @@ -65,7 +73,11 @@ let package = Package(
/// IncrementalImport tests
.testTarget(
name: "IncrementalImportTests",
dependencies: ["IncrementalTestFramework", "TestUtilities", "SwiftToolsSupport-auto"]),
dependencies: [
"IncrementalTestFramework",
"TestUtilities",
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
]),

.target(
name: "IncrementalTestFramework",
Expand All @@ -83,28 +95,34 @@ let package = Package(
/// The options library.
.target(
name: "SwiftOptions",
dependencies: ["SwiftToolsSupport-auto"]),
dependencies: [
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
]),
.testTarget(
name: "SwiftOptionsTests",
dependencies: ["SwiftOptions"]),

/// The primary driver executable.
.target(
.executableTarget(
name: "swift-driver",
dependencies: ["SwiftDriverExecution", "SwiftDriver"]),

/// The help executable.
.target(
.executableTarget(
name: "swift-help",
dependencies: ["SwiftOptions", "ArgumentParser", "SwiftToolsSupport-auto"]),
dependencies: [
"SwiftOptions",
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
]),

/// The help executable.
.target(
.executableTarget(
name: "swift-build-sdk-interfaces",
dependencies: ["SwiftDriver", "SwiftDriverExecution"]),

/// The `makeOptions` utility (for importing option definitions).
.target(
.executableTarget(
name: "makeOptions",
dependencies: []),
],
Expand All @@ -123,7 +141,9 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
.package(path: "../llbuild"),
]
}
package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += ["llbuildSwift"]
package.targets.first(where: { $0.name == "SwiftDriverExecution" })!.dependencies += [
.product(name: "llbuildSwift", package: "swift-llbuild"),
]
}

if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
Expand Down