Skip to content

Modernize Package.swift. #294

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
Mar 22, 2022
Merged

Modernize Package.swift. #294

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
96 changes: 63 additions & 33 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:5.1
// swift-tools-version:5.6
//===----------------------------------------------------------------------===//
//
// This source file is part of the Swift.org open source project
Expand All @@ -11,20 +11,30 @@
//
//===----------------------------------------------------------------------===//

import PackageDescription
import Foundation
import PackageDescription

let package = Package(
name: "swift-format",
platforms: [
.macOS(.v10_11)
.macOS("10.15")
],
products: [
.executable(name: "swift-format", targets: ["swift-format"]),
.library(name: "SwiftFormat", targets: ["SwiftFormat", "SwiftFormatConfiguration"]),
.library(name: "SwiftFormatConfiguration", targets: ["SwiftFormatConfiguration"]),
.executable(
name: "swift-format",
targets: ["swift-format"]
),
.library(
name: "SwiftFormat",
targets: ["SwiftFormat", "SwiftFormatConfiguration"]
),
.library(
name: "SwiftFormatConfiguration",
targets: ["SwiftFormatConfiguration"]
),
],
dependencies: [
// See the "Dependencies" section below.
],
targets: [
.target(
Expand All @@ -35,12 +45,20 @@ let package = Package(
"SwiftFormatPrettyPrint",
"SwiftFormatRules",
"SwiftFormatWhitespaceLinter",
"SwiftSyntax",
"SwiftSyntaxParser",
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxParser", package: "swift-syntax"),
]
),
.target(
name: "SwiftFormatConfiguration"
),
.target(
name: "SwiftFormatCore",
dependencies: [
"SwiftFormatConfiguration",
.product(name: "SwiftSyntax", package: "swift-syntax"),
]
),
.target(name: "SwiftFormatConfiguration"),
.target(name: "SwiftFormatCore", dependencies: ["SwiftFormatConfiguration", "SwiftSyntax"]),
.target(
name: "SwiftFormatRules",
dependencies: ["SwiftFormatCore", "SwiftFormatConfiguration"]
Expand All @@ -61,35 +79,37 @@ let package = Package(
name: "SwiftFormatWhitespaceLinter",
dependencies: [
"SwiftFormatCore",
"SwiftSyntax",
.product(name: "SwiftSyntax", package: "swift-syntax"),
]
),
.target(

.executableTarget(
name: "generate-pipeline",
dependencies: [
"SwiftFormatCore",
"SwiftFormatRules",
"SwiftSyntax",
"SwiftSyntaxParser",
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxParser", package: "swift-syntax"),
]
),
.target(
.executableTarget(
name: "swift-format",
dependencies: [
"ArgumentParser",
"SwiftFormat",
"SwiftFormatConfiguration",
"SwiftFormatCore",
"SwiftSyntax",
"TSCBasic",
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "TSCBasic", package: "swift-tools-support-core"),
]
),

.testTarget(
name: "SwiftFormatTests",
dependencies: [
"SwiftFormat",
"SwiftSyntax",
"SwiftSyntaxParser",
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxParser", package: "swift-syntax"),
]
),
.testTarget(
Expand All @@ -101,17 +121,17 @@ let package = Package(
dependencies: [
"SwiftFormatConfiguration",
"SwiftFormatCore",
"SwiftSyntax",
"SwiftSyntaxParser",
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxParser", package: "swift-syntax"),
]
),
.testTarget(
name: "SwiftFormatPerformanceTests",
dependencies: [
"SwiftFormatTestSupport",
"SwiftFormatWhitespaceLinter",
"SwiftSyntax",
"SwiftSyntaxParser",
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxParser", package: "swift-syntax"),
]
),
.testTarget(
Expand All @@ -122,8 +142,8 @@ let package = Package(
"SwiftFormatPrettyPrint",
"SwiftFormatRules",
"SwiftFormatTestSupport",
"SwiftSyntax",
"SwiftSyntaxParser",
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxParser", package: "swift-syntax"),
]
),
.testTarget(
Expand All @@ -134,8 +154,8 @@ let package = Package(
"SwiftFormatPrettyPrint",
"SwiftFormatRules",
"SwiftFormatTestSupport",
"SwiftSyntax",
"SwiftSyntaxParser",
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxParser", package: "swift-syntax"),
]
),
.testTarget(
Expand All @@ -145,20 +165,30 @@ let package = Package(
"SwiftFormatCore",
"SwiftFormatTestSupport",
"SwiftFormatWhitespaceLinter",
"SwiftSyntax",
"SwiftSyntaxParser",
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxParser", package: "swift-syntax"),
]
),
]
)

// MARK: Dependencies

if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
// Building standalone.
package.dependencies += [
.package(url: "https://github.com/apple/swift-argument-parser.git", .branch("main")),
.package(url: "https://github.com/apple/swift-syntax", .branch("main")),
.package(url: "https://github.com/apple/swift-tools-support-core.git", .branch("main")),
.package(
url: "https://github.com/apple/swift-argument-parser.git",
branch: "main"
),
.package(
url: "https://github.com/apple/swift-syntax",
branch: "main"
),
.package(
url: "https://github.com/apple/swift-tools-support-core.git",
branch: "main"
),
]
} else {
package.dependencies += [
Expand Down