Skip to content

Commit 2226d7e

Browse files
authored
remove a few deprecated apis (#3653)
motivation: cleanup deprecated methods changes: remove apis deprecated 6m+ ago
1 parent 40f3a65 commit 2226d7e

File tree

3 files changed

+0
-115
lines changed

3 files changed

+0
-115
lines changed

Sources/PackageLoading/ManifestLoader.swift

Lines changed: 0 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -157,43 +157,6 @@ public final class ManifestLoader: ManifestLoaderProtocol {
157157
self.operationQueue.maxConcurrentOperationCount = Concurrency.maxOperations
158158
}
159159

160-
// deprecated 3/21, remove once clients migrated over
161-
@available(*, deprecated, message: "use loadRootManifest instead")
162-
public static func loadManifest(
163-
at path: AbsolutePath,
164-
kind: PackageReference.Kind,
165-
swiftCompiler: AbsolutePath,
166-
swiftCompilerFlags: [String],
167-
identityResolver: IdentityResolver,
168-
on queue: DispatchQueue,
169-
completion: @escaping (Result<Manifest, Error>) -> Void
170-
) {
171-
do {
172-
let fileSystem = localFileSystem
173-
let resources = try UserManifestResources(swiftCompiler: swiftCompiler, swiftCompilerFlags: swiftCompilerFlags)
174-
let loader = ManifestLoader(manifestResources: resources)
175-
let toolsVersion = try ToolsVersionLoader().load(at: path, fileSystem: fileSystem)
176-
let packageLocation = path.pathString
177-
let packageIdentity = identityResolver.resolveIdentity(for: packageLocation)
178-
loader.load(
179-
at: path,
180-
packageIdentity: packageIdentity,
181-
packageKind: kind,
182-
packageLocation: packageLocation,
183-
version: nil,
184-
revision: nil,
185-
toolsVersion: toolsVersion,
186-
identityResolver: identityResolver,
187-
fileSystem: fileSystem,
188-
diagnostics: nil,
189-
on: queue,
190-
completion: completion
191-
)
192-
} catch {
193-
return completion(.failure(error))
194-
}
195-
}
196-
197160
/// Loads a root manifest from a path using the resources associated with a particular `swiftc` executable.
198161
///
199162
/// - Parameters:
@@ -238,36 +201,6 @@ public final class ManifestLoader: ManifestLoaderProtocol {
238201
}
239202
}
240203

241-
// deprecated 3/21, remove once clients migrated over
242-
@available(*, deprecated, message: "use load(at: packageIdentity:, ...) variant instead")
243-
public func load(
244-
at path: AbsolutePath,
245-
packageKind: PackageReference.Kind,
246-
packageLocation: String,
247-
version: Version?,
248-
revision: String?,
249-
toolsVersion: ToolsVersion,
250-
identityResolver: IdentityResolver,
251-
fileSystem: FileSystem,
252-
diagnostics: DiagnosticsEngine? = nil,
253-
on queue: DispatchQueue,
254-
completion: @escaping (Result<Manifest, Error>) -> Void
255-
) {
256-
let packageIdentity = identityResolver.resolveIdentity(for: packageLocation)
257-
self.load(at: path,
258-
packageIdentity: packageIdentity,
259-
packageKind: packageKind,
260-
packageLocation: packageLocation,
261-
version: version,
262-
revision: revision,
263-
toolsVersion: toolsVersion,
264-
identityResolver: identityResolver,
265-
fileSystem: fileSystem,
266-
diagnostics: diagnostics,
267-
on: queue,
268-
completion: completion)
269-
}
270-
271204
public func load(
272205
at path: AbsolutePath,
273206
packageIdentity: PackageIdentity,

Sources/PackageLoading/PackageBuilder.swift

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -287,41 +287,6 @@ public final class PackageBuilder {
287287
self.warnAboutImplicitExecutableTargets = warnAboutImplicitExecutableTargets
288288
}
289289

290-
// deprecated 3/21, remove once clients migrated over
291-
@available(*, deprecated, message: "use loadRootPackage instead")
292-
public static func loadPackage(
293-
at path: AbsolutePath,
294-
kind: PackageReference.Kind = .root,
295-
swiftCompiler: AbsolutePath,
296-
swiftCompilerFlags: [String],
297-
xcTestMinimumDeploymentTargets: [PackageModel.Platform:PlatformVersion]
298-
= MinimumDeploymentTarget.default.xcTestMinimumDeploymentTargets,
299-
identityResolver: IdentityResolver,
300-
diagnostics: DiagnosticsEngine,
301-
on queue: DispatchQueue,
302-
completion: @escaping (Result<Package, Error>) -> Void
303-
) {
304-
ManifestLoader.loadManifest(at: path,
305-
kind: kind,
306-
swiftCompiler: swiftCompiler,
307-
swiftCompilerFlags: swiftCompilerFlags,
308-
identityResolver: identityResolver,
309-
on: queue) { result in
310-
let result = result.tryMap { manifest -> Package in
311-
let identity = identityResolver.resolveIdentity(for: manifest.packageLocation)
312-
let builder = PackageBuilder(
313-
identity: identity,
314-
manifest: manifest,
315-
productFilter: .everything,
316-
path: path,
317-
xcTestMinimumDeploymentTargets: xcTestMinimumDeploymentTargets,
318-
diagnostics: diagnostics)
319-
return try builder.construct()
320-
}
321-
completion(result)
322-
}
323-
}
324-
325290
/// Loads a root package from a path using the resources associated with a particular `swiftc` executable.
326291
///
327292
/// - Parameters:

Sources/Workspace/Workspace.swift

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -619,19 +619,6 @@ extension Workspace {
619619
return nil
620620
}
621621

622-
623-
// deprecated 3/21, remove once clients migrated over
624-
@available(*, deprecated, message: "use loadRootPackage instead")
625-
public static func loadGraph(
626-
packagePath: AbsolutePath,
627-
swiftCompiler: AbsolutePath,
628-
swiftCompilerFlags: [String],
629-
identityResolver: IdentityResolver,
630-
diagnostics: DiagnosticsEngine
631-
) throws -> PackageGraph {
632-
return try Self.loadRootGraph(at: packagePath, swiftCompiler: swiftCompiler, swiftCompilerFlags: swiftCompilerFlags, identityResolver: identityResolver, diagnostics: diagnostics)
633-
}
634-
635622
/// Loads a package graph from a root package using the resources associated with a particular `swiftc` executable.
636623
///
637624
/// - Parameters:

0 commit comments

Comments
 (0)