Skip to content

Commit b7d4270

Browse files
authored
Package.swift: fix deprecated dependency initializers (#748)
* Package.swift: fix deprecated dependency initializers * Fix remaining uses of deprecated initializer * Package.swift: keep `name:` initializer to match `swiftpm` to `swift-package-manager` This checkout path is hardcoded in `update-checkout-config.json` of our `swift` repository and can't be easily changed, so we have to keep this initializer call.
1 parent 8975c53 commit b7d4270

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

Package.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ let package = Package(
5353
name: "SourceKitLSP",
5454
dependencies: [
5555
"BuildServerProtocol",
56-
"IndexStoreDB",
56+
.product(name: "IndexStoreDB", package: "indexstore-db"),
5757
"LanguageServerProtocol",
5858
"LanguageServerProtocolJSONRPC",
5959
"SKCore",
@@ -75,7 +75,7 @@ let package = Package(
7575
"CSKTestSupport",
7676
"LSPTestSupport",
7777
"SourceKitLSP",
78-
.product(name: "ISDBTestSupport", package: "IndexStoreDB"),
78+
.product(name: "ISDBTestSupport", package: "indexstore-db"),
7979
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
8080
],
8181
resources: [
@@ -96,7 +96,7 @@ let package = Package(
9696
"BuildServerProtocol",
9797
"LanguageServerProtocol",
9898
"SKCore",
99-
.product(name: "SwiftPM-auto", package: "SwiftPM")
99+
.product(name: "SwiftPM-auto", package: "swift-package-manager")
100100
],
101101
exclude: ["CMakeLists.txt"]),
102102

@@ -119,7 +119,7 @@ let package = Package(
119119
"LanguageServerProtocol",
120120
"LanguageServerProtocolJSONRPC",
121121
"SKSupport",
122-
.product(name: "SwiftPMDataModel-auto", package: "SwiftPM"),
122+
.product(name: "SwiftPMDataModel-auto", package: "swift-package-manager"),
123123
.product(name: "SwiftToolsSupport-auto", package: "swift-tools-support-core"),
124124
],
125125
exclude: ["CMakeLists.txt"]),
@@ -249,16 +249,16 @@ let package = Package(
249249
if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
250250
// Building standalone.
251251
package.dependencies += [
252-
.package(name: "IndexStoreDB", url: "https://github.com/apple/indexstore-db.git", branch: "main"),
253-
.package(name: "SwiftPM", url: "https://github.com/apple/swift-package-manager.git", branch: "main"),
252+
.package(url: "https://github.com/apple/indexstore-db.git", branch: "main"),
253+
.package(url: "https://github.com/apple/swift-package-manager.git", branch: "main"),
254254
.package(url: "https://github.com/apple/swift-tools-support-core.git", branch: "main"),
255255
.package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.2.2"),
256256
.package(url: "https://github.com/apple/swift-syntax.git", branch: "main"),
257257
]
258258
} else {
259259
package.dependencies += [
260-
.package(name: "IndexStoreDB", path: "../indexstore-db"),
261-
.package(name: "SwiftPM", path: "../swiftpm"),
260+
.package(path: "../indexstore-db"),
261+
.package(name: "swift-package-manager", path: "../swiftpm"),
262262
.package(path: "../swift-tools-support-core"),
263263
.package(path: "../swift-argument-parser"),
264264
.package(path: "../swift-syntax")

0 commit comments

Comments
 (0)