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

Jump to bottom

Package.swift: fix deprecated dependency initializers #748

Merged
merged 3 commits into from May 24, 2023
Merged

Package.swift: fix deprecated dependency initializers #748

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b0f118
Package.swift: fix deprecated dependency initializers
MaxDesiatov May 21, 2023
be7391b
Fix remaining uses of deprecated initializer
MaxDesiatov May 22, 2023
730cc6c
Package.swift: keep `name:` initializer to match `swiftpm` to `swift-…
MaxDesiatov May 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions Package.swift
View file
Open in desktop
Expand Up @@ -53,7 +53,7 @@ let package = Package(
name: "SourceKitLSP",
dependencies: [
"BuildServerProtocol",
"IndexStoreDB",
.product(name: "IndexStoreDB", package: "indexstore-db"),
"LanguageServerProtocol",
"LanguageServerProtocolJSONRPC",
"SKCore",
Expand All @@ -75,7 +75,7 @@ let package = Package(
"CSKTestSupport",
"LSPTestSupport",
"SourceKitLSP",
.product(name: "ISDBTestSupport", package: "IndexStoreDB"),
.product(name: "ISDBTestSupport", package: "indexstore-db"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
],
resources: [
Expand All @@ -96,7 +96,7 @@ let package = Package(
"BuildServerProtocol",
"LanguageServerProtocol",
"SKCore",
.product(name: "SwiftPM-auto", package: "SwiftPM")
.product(name: "SwiftPM-auto", package: "swift-package-manager")
],
exclude: ["CMakeLists.txt"]),

Expand All @@ -119,7 +119,7 @@ let package = Package(
"LanguageServerProtocol",
"LanguageServerProtocolJSONRPC",
"SKSupport",
.product(name: "SwiftPMDataModel-auto", package: "SwiftPM"),
.product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"),
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
],
exclude: ["CMakeLists.txt"]),
Expand Down Expand Up @@ -249,16 +249,16 @@ let package = Package(
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
// Building standalone.
package.dependencies += [
.package(name: "IndexStoreDB", url: "https://github.com/apple/indexstore-db.git", branch: "main"),
.package(name: "SwiftPM", url: "https://github.com/apple/swift-package-manager.git", branch: "main"),
.package(url: "https://github.com/apple/indexstore-db.git", branch: "main"),
.package(url: "https://github.com/apple/swift-package-manager.git", 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", from: "1.2.2"),
.package(url: "https://github.com/apple/swift-syntax.git", branch: "main"),
]
} else {
package.dependencies += [
.package(name: "IndexStoreDB", path: "../indexstore-db"),
.package(name: "SwiftPM", path: "../swiftpm"),
.package(path: "../indexstore-db"),
.package(name: "swift-package-manager", path: "../swiftpm"),
.package(path: "../swift-tools-support-core"),
.package(path: "../swift-argument-parser"),
.package(path: "../swift-syntax")
Expand Down