From 7b0f1186fb28caf101f12a0772311a35d239dbfa Mon Sep 17 00:00:00 2001
From: Max Desiatov <max@desiatov.com>
Date: Sun, 21 May 2023 21:23:53 +0100
Subject: [PATCH 1/3] Package.swift: fix deprecated dependency initializers

---
 Package.swift | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Package.swift b/Package.swift
index 78f64bc60..9cd0280d4 100644
--- a/Package.swift
+++ b/Package.swift
@@ -53,7 +53,7 @@ let package = Package(
         name: "SourceKitLSP",
         dependencies: [
           "BuildServerProtocol",
-          "IndexStoreDB",
+          .product(name: "IndexStoreDB", package: "indexstore-db"),
           "LanguageServerProtocol",
           "LanguageServerProtocolJSONRPC",
           "SKCore",
@@ -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: [
@@ -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"]),
 
@@ -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"]),
@@ -249,8 +249,8 @@ 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"),

From be7391b635a893e534f8c356114e94426b5a23cd Mon Sep 17 00:00:00 2001
From: Max Desiatov <m_desiatov@apple.com>
Date: Mon, 22 May 2023 21:36:20 +0100
Subject: [PATCH 2/3] Fix remaining uses of deprecated initializer

---
 Package.swift | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Package.swift b/Package.swift
index 9cd0280d4..599fd1f7a 100644
--- a/Package.swift
+++ b/Package.swift
@@ -257,8 +257,8 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
   ]
 } else {
   package.dependencies += [
-    .package(name: "IndexStoreDB", path: "../indexstore-db"),
-    .package(name: "SwiftPM", path: "../swiftpm"),
+    .package(path: "../indexstore-db"),
+    .package(path: "../swiftpm"),
     .package(path: "../swift-tools-support-core"),
     .package(path: "../swift-argument-parser"),
     .package(path: "../swift-syntax")

From 730cc6c3078f1997d062cc60c7d9aea76bc1aba7 Mon Sep 17 00:00:00 2001
From: Max Desiatov <m_desiatov@apple.com>
Date: Tue, 23 May 2023 22:43:51 +0100
Subject: [PATCH 3/3] 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 deprecated initializer call for a bit more time.
---
 Package.swift | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Package.swift b/Package.swift
index 599fd1f7a..f0fdddbec 100644
--- a/Package.swift
+++ b/Package.swift
@@ -258,7 +258,7 @@ if ProcessInfo.processInfo.environment["SWIFTCI_USE_LOCAL_DEPS"] == nil {
 } else {
   package.dependencies += [
     .package(path: "../indexstore-db"),
-    .package(path: "../swiftpm"),
+    .package(name: "swift-package-manager", path: "../swiftpm"),
     .package(path: "../swift-tools-support-core"),
     .package(path: "../swift-argument-parser"),
     .package(path: "../swift-syntax")