Skip to content

remove a few deprecated apis #3653

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
Aug 9, 2021
Merged

remove a few deprecated apis #3653

Show file tree
Hide file tree
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
67 changes: 0 additions & 67 deletions Sources/PackageLoading/ManifestLoader.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,43 +157,6 @@ public final class ManifestLoader: ManifestLoaderProtocol {
self.operationQueue.maxConcurrentOperationCount = Concurrency.maxOperations
}

// deprecated 3/21, remove once clients migrated over
@available(*, deprecated, message: "use loadRootManifest instead")
public static func loadManifest(
at path: AbsolutePath,
kind: PackageReference.Kind,
swiftCompiler: AbsolutePath,
swiftCompilerFlags: [String],
identityResolver: IdentityResolver,
on queue: DispatchQueue,
completion: @escaping (Result<Manifest, Error>) -> Void
) {
do {
let fileSystem = localFileSystem
let resources = try UserManifestResources(swiftCompiler: swiftCompiler, swiftCompilerFlags: swiftCompilerFlags)
let loader = ManifestLoader(manifestResources: resources)
let toolsVersion = try ToolsVersionLoader().load(at: path, fileSystem: fileSystem)
let packageLocation = path.pathString
let packageIdentity = identityResolver.resolveIdentity(for: packageLocation)
loader.load(
at: path,
packageIdentity: packageIdentity,
packageKind: kind,
packageLocation: packageLocation,
version: nil,
revision: nil,
toolsVersion: toolsVersion,
identityResolver: identityResolver,
fileSystem: fileSystem,
diagnostics: nil,
on: queue,
completion: completion
)
} catch {
return completion(.failure(error))
}
}

/// Loads a root manifest from a path using the resources associated with a particular `swiftc` executable.
///
/// - Parameters:
Expand Down Expand Up @@ -238,36 +201,6 @@ public final class ManifestLoader: ManifestLoaderProtocol {
}
}

// deprecated 3/21, remove once clients migrated over
@available(*, deprecated, message: "use load(at: packageIdentity:, ...) variant instead")
public func load(
at path: AbsolutePath,
packageKind: PackageReference.Kind,
packageLocation: String,
version: Version?,
revision: String?,
toolsVersion: ToolsVersion,
identityResolver: IdentityResolver,
fileSystem: FileSystem,
diagnostics: DiagnosticsEngine? = nil,
on queue: DispatchQueue,
completion: @escaping (Result<Manifest, Error>) -> Void
) {
let packageIdentity = identityResolver.resolveIdentity(for: packageLocation)
self.load(at: path,
packageIdentity: packageIdentity,
packageKind: packageKind,
packageLocation: packageLocation,
version: version,
revision: revision,
toolsVersion: toolsVersion,
identityResolver: identityResolver,
fileSystem: fileSystem,
diagnostics: diagnostics,
on: queue,
completion: completion)
}

public func load(
at path: AbsolutePath,
packageIdentity: PackageIdentity,
Expand Down
35 changes: 0 additions & 35 deletions Sources/PackageLoading/PackageBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,41 +287,6 @@ public final class PackageBuilder {
self.warnAboutImplicitExecutableTargets = warnAboutImplicitExecutableTargets
}

// deprecated 3/21, remove once clients migrated over
@available(*, deprecated, message: "use loadRootPackage instead")
public static func loadPackage(
at path: AbsolutePath,
kind: PackageReference.Kind = .root,
swiftCompiler: AbsolutePath,
swiftCompilerFlags: [String],
xcTestMinimumDeploymentTargets: [PackageModel.Platform:PlatformVersion]
= MinimumDeploymentTarget.default.xcTestMinimumDeploymentTargets,
identityResolver: IdentityResolver,
diagnostics: DiagnosticsEngine,
on queue: DispatchQueue,
completion: @escaping (Result<Package, Error>) -> Void
) {
ManifestLoader.loadManifest(at: path,
kind: kind,
swiftCompiler: swiftCompiler,
swiftCompilerFlags: swiftCompilerFlags,
identityResolver: identityResolver,
on: queue) { result in
let result = result.tryMap { manifest -> Package in
let identity = identityResolver.resolveIdentity(for: manifest.packageLocation)
let builder = PackageBuilder(
identity: identity,
manifest: manifest,
productFilter: .everything,
path: path,
xcTestMinimumDeploymentTargets: xcTestMinimumDeploymentTargets,
diagnostics: diagnostics)
return try builder.construct()
}
completion(result)
}
}

/// Loads a root package from a path using the resources associated with a particular `swiftc` executable.
///
/// - Parameters:
Expand Down
13 changes: 0 additions & 13 deletions Sources/Workspace/Workspace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,19 +619,6 @@ extension Workspace {
return nil
}


// deprecated 3/21, remove once clients migrated over
@available(*, deprecated, message: "use loadRootPackage instead")
public static func loadGraph(
packagePath: AbsolutePath,
swiftCompiler: AbsolutePath,
swiftCompilerFlags: [String],
identityResolver: IdentityResolver,
diagnostics: DiagnosticsEngine
) throws -> PackageGraph {
return try Self.loadRootGraph(at: packagePath, swiftCompiler: swiftCompiler, swiftCompilerFlags: swiftCompilerFlags, identityResolver: identityResolver, diagnostics: diagnostics)
}

/// Loads a package graph from a root package using the resources associated with a particular `swiftc` executable.
///
/// - Parameters:
Expand Down