Remove most deprecated APIs (#5756)

Currently, we still need the diagnostics compatibility layer because swift-driver uses the TSC diagnostics engine.

Author: neonichu

Sources/Basics/Observability.swift

@@ -470,21 +470,6 @@ public struct ObservabilityMetadata: CustomDebugStringConvertible {
         }
     }
 
-    @available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
-    public func droppingLegacyKeys() -> ObservabilityMetadata? {
-        var metadata = ObservabilityMetadata()
-        self.forEach { (key, value) in
-            if key.keyType == LegacyLocationKey.self {
-                return
-            }
-            if key.keyType == LegacyDataKey.self {
-                return
-            }
-            metadata._storage[key] = value
-        }
-        return metadata.isEmpty ? .none : metadata
-    }
-
     /// A type-erased `ObservabilityMetadataKey` used when iterating through the `ObservabilityMetadata` using its `forEach` method.
     public struct AnyKey {
         /// The key's type represented erased to an `Any.Type`.
@@ -571,53 +556,6 @@ extension Diagnostic {
     }
 }
 
-@available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
-extension ObservabilitySystem {
-    public convenience init(diagnosticEngine: DiagnosticsEngine) {
-        self.init(DiagnosticsEngineAdapter(diagnosticEngine: diagnosticEngine))
-    }
-
-    private struct DiagnosticsEngineAdapter: ObservabilityHandlerProvider, DiagnosticsHandler {
-        let diagnosticEngine: DiagnosticsEngine
-
-        var diagnosticsHandler: DiagnosticsHandler { self }
-
-        func handleDiagnostic(scope: ObservabilityScope, diagnostic: Diagnostic) {
-            diagnosticEngine.emit(.init(diagnostic))
-        }
-    }
-}
-
-@available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
-extension TSCBasic.Diagnostic {
-    public init(_ diagnostic: Diagnostic) {
-        let location: DiagnosticLocation
-        if let legacyLocation = diagnostic.metadata?.legacyDiagnosticLocation {
-            location = legacyLocation.underlying
-        } else {
-            location = UnknownLocation.location
-        }
-
-        let data: DiagnosticData
-        if let legacyData = diagnostic.metadata?.legacyDiagnosticData {
-            data = legacyData.underlying
-        } else {
-            data = StringDiagnostic(diagnostic.message)
-        }
-
-        switch diagnostic.severity {
-        case .error:
-            self = .init(message: .error(data), location: location)
-        case .warning:
-            self = .init(message: .warning(data), location: location)
-        case .info:
-            self = .init(message: .note(data), location: location)
-        case .debug:
-            self = .init(message: .note(data), location: location)
-        }
-    }
-}
-
 @available(*, deprecated, message: "temporary for transition DiagnosticsEngine -> DiagnosticsEmitter")
 extension ObservabilityMetadata {
     public var legacyDiagnosticLocation: DiagnosticLocationWrapper? {

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

@@ -270,11 +270,6 @@ private final class InProcessTool: Tool {
         self.type = type
     }
 
-    @available(*, deprecated, message: "Use the overload that returns an Optional")
-    func createCommand(_ name: String) -> ExternalCommand {
-        return type.init(self.context)
-    }
-
     func createCommand(_ name: String) -> ExternalCommand? {
         return type.init(self.context)
     }

Sources/Build/SPMSwiftDriverExecutor.swift

@@ -44,7 +44,7 @@ final class SPMSwiftDriverExecutor: DriverExecutor {
                  forceResponseFiles: Bool,
                  recordedInputModificationDates: [TypedVirtualPath : TimePoint]) throws -> ProcessResult {
         let arguments: [String] = try resolver.resolveArgumentList(for: job,
-                                                                   forceResponseFiles: forceResponseFiles)
+                                                                   useResponseFiles: forceResponseFiles ? .forced : .heuristic)
 
         try job.verifyInputsNotModified(since: recordedInputModificationDates,
                                         fileSystem: fileSystem)
@@ -74,7 +74,7 @@ final class SPMSwiftDriverExecutor: DriverExecutor {
     func description(of job: Job, forceResponseFiles: Bool) throws -> String {
         // FIXME: This is duplicated from SwiftDriver, maybe it shouldn't be a protocol requirement.
         let (args, usedResponseFile) = try resolver.resolveArgumentList(for: job,
-                                                                        forceResponseFiles: forceResponseFiles)
+                                                                        useResponseFiles: forceResponseFiles ? .forced : .heuristic)
         var result = args.joined(separator: " ")
 
         if usedResponseFile {

Sources/PackageCollections/API.swift

@@ -106,41 +106,6 @@ public protocol PackageCollectionsProtocol {
         callback: @escaping (Result<PackageCollectionsModel.Collection, Error>) -> Void
     )
 
-    // MARK: - Package APIs
-
-    /// Returns metadata for the package identified by the given `PackageReference`, along with the
-    /// identifiers of `PackageCollection`s where the package is found.
-    ///
-    /// A failure is returned if the package is not found.
-    ///
-    /// - Parameters:
-    ///   - reference: The package reference
-    ///   - callback: The closure to invoke when result becomes available
-    // deprecated 9/21
-    @available(*, deprecated, message: "use getPackageMetadata(identity:) instead")
-    func getPackageMetadata(
-        _ reference: PackageReference,
-        callback: @escaping (Result<PackageCollectionsModel.PackageMetadata, Error>) -> Void
-    )
-
-    /// Returns metadata for the package identified by the given `PackageReference`, along with the
-    /// identifiers of `PackageCollection`s where the package is found.
-    ///
-    /// A failure is returned if the package is not found.
-    ///
-    /// - Parameters:
-    ///   - reference: The package reference
-    ///   - collections: Optional. If specified, only look for package in these collections. Data from the most recently
-    ///                  processed collection will be used.
-    ///   - callback: The closure to invoke when result becomes available
-    // deprecated 9/21
-    @available(*, deprecated, message: "use getPackageMetadata(identity:) instead")
-    func getPackageMetadata(
-        _ reference: PackageReference,
-        collections: Set<PackageCollectionsModel.CollectionIdentifier>?,
-        callback: @escaping (Result<PackageCollectionsModel.PackageMetadata, Error>) -> Void
-    )
-
     /// Returns metadata for the package identified by the given `PackageIdentity`, along with the
     /// identifiers of `PackageCollection`s where the package is found.
     ///

Sources/PackageCollections/Model/PackageTypes.swift

@@ -85,24 +85,6 @@ extension PackageCollectionsModel {
         /// The package's programming languages
         public let languages: Set<String>?
 
-        // deprecated 9/21
-        @available(*, deprecated, message: "use identity and location instead")
-        public var reference: PackageReference {
-            guard let url = URL(string: self.location) else {
-                fatalError("invalid url \(self.location)")
-            }
-            return .init(identity: self.identity, kind: .remoteSourceControl(url), name: nil)
-        }
-
-        // deprecated 9/21
-        @available(*, deprecated, message: "use identity and location instead")
-        public var repository: RepositorySpecifier {
-            guard let url = URL(string: self.location) else {
-                fatalError("invalid url \(self.location)")
-            }
-            return .init(url: url)
-        }
-
         /// Initializes a `Package`
         init(
             identity: PackageIdentity,
@@ -159,27 +141,6 @@ extension PackageCollectionsModel.Package {
 
         /// When the package version was created
         public let createdAt: Date?
-        
-        @available(*, deprecated, message: "use manifests instead")
-        public var packageName: String { self.defaultManifest!.packageName }
-
-        @available(*, deprecated, message: "use manifests instead")
-        public var targets: [Target] { self.defaultManifest!.targets }
-
-        @available(*, deprecated, message: "use manifests instead")
-        public var products: [Product] { self.defaultManifest!.products }
-
-        @available(*, deprecated, message: "use manifests instead")
-        public var toolsVersion: ToolsVersion { self.defaultManifest!.toolsVersion }
-
-        @available(*, deprecated, message: "use manifests instead")
-        public var minimumPlatformVersions: [SupportedPlatform]? { nil }
-
-        @available(*, deprecated, message: "use verifiedCompatibility instead")
-        public var verifiedPlatforms: [PackageModel.Platform]? { nil }
-
-        @available(*, deprecated, message: "use verifiedCompatibility instead")
-        public var verifiedSwiftVersions: [SwiftLanguageVersion]? { nil }
 
         public struct Manifest: Equatable, Codable {
             /// The Swift tools version specified in `Package.swift`.

Sources/PackageCollections/Model/TargetListResult.swift

@@ -48,15 +48,6 @@ extension PackageCollectionsModel.TargetListResult {
 
         /// Package collections that contain this package and at least one of the `versions`
         public let collections: [PackageCollectionsModel.CollectionIdentifier]
-
-        // deprecated 9/2021
-        @available(*, deprecated, message: "use identity and location instead")
-        public var repository: RepositorySpecifier {
-            guard let url = URL(string: self.location) else {
-                fatalError("invalid url \(self.location)")
-            }
-            return .init(url: url)
-        }
     }
 }
 

Sources/PackageCollections/PackageCollections.swift

@@ -393,21 +393,6 @@ public struct PackageCollections: PackageCollectionsProtocol, Closable {
 
     // MARK: - Package Metadata
 
-    // deprecated 9/21
-    @available(*, deprecated, message: "user identity based API instead")
-    public func getPackageMetadata(_ reference: PackageReference,
-                                   callback: @escaping (Result<PackageCollectionsModel.PackageMetadata, Error>) -> Void) {
-        self.getPackageMetadata(reference, collections: nil, callback: callback)
-    }
-
-    // deprecated 9/21
-    @available(*, deprecated, message: "user identity based API instead")
-    public func getPackageMetadata(_ reference: PackageReference,
-                                   collections: Set<PackageCollectionsModel.CollectionIdentifier>?,
-                                   callback: @escaping (Result<PackageCollectionsModel.PackageMetadata, Error>) -> Void) {
-        self.getPackageMetadata(identity: reference.identity, location: reference.locationString, collections: .none, callback: callback)
-    }
-
     public func getPackageMetadata(identity: PackageIdentity,
                                    location: String? = .none,
                                    callback: @escaping (Result<PackageCollectionsModel.PackageMetadata, Error>) -> Void) {

Sources/PackageGraph/DependencyMirrors.swift

@@ -36,11 +36,6 @@ public final class DependencyMirrors: Equatable {
         self.visited = .init()
     }
 
-    @available(*, deprecated)
-    private convenience init(_ mirrors: [Mirror]) {
-        self.init(Dictionary(mirrors.map({ ($0.original, $0.mirror) }), uniquingKeysWith: { first, _ in first }))
-    }
-
     public static func == (lhs: DependencyMirrors, rhs: DependencyMirrors) -> Bool {
         return lhs.mapping == rhs.mapping
     }
@@ -189,45 +184,3 @@ extension DependencyMirrors: ExpressibleByDictionaryLiteral {
         self.init(Dictionary(elements, uniquingKeysWith: { first, _ in first }))
     }
 }
-
-@available(*, deprecated)
-extension DependencyMirrors: JSONMappable, JSONSerializable {
-    public convenience init(json: JSON) throws {
-        self.init(try [Mirror](json: json))
-    }
-
-    public func toJSON() -> JSON {
-        let mirrors = self.index.map { Mirror(original: $0.key, mirror: $0.value) }
-        return .array(mirrors.sorted(by: { $0.original < $1.mirror }).map { $0.toJSON() })
-    }
-}
-
-/// An individual repository mirror.
-@available(*, deprecated)
-private struct Mirror {
-    /// The original repository path.
-    let original: String
-
-    /// The mirrored repository path.
-    let mirror: String
-
-    init(original: String, mirror: String) {
-        self.original = original
-        self.mirror = mirror
-    }
-}
-
-@available(*, deprecated)
-extension Mirror: JSONMappable, JSONSerializable {
-    init(json: JSON) throws {
-        self.original = try json.get("original")
-        self.mirror = try json.get("mirror")
-    }
-
-    func toJSON() -> JSON {
-        .init([
-            "original": original,
-            "mirror": mirror
-        ])
-    }
-}

Sources/PackageGraph/DependencyResolver.swift

@@ -46,63 +46,6 @@ public protocol DependencyResolverDelegate {
     func solved(result: [DependencyResolver.Binding])
 }
 
-@available(*, deprecated, message: "user verbosity flags instead")
-public struct TracingDependencyResolverDelegate: DependencyResolverDelegate {
-    private let stream: OutputByteStream
-
-    public init (path: AbsolutePath) throws {
-        self.stream = try LocalFileOutputByteStream(path, closeOnDeinit: true, buffered: false)
-    }
-
-    public init (stream: OutputByteStream) {
-        self.stream = stream
-    }
-
-    public func willResolve(term: Term) {
-        self.log("resolving: \(term.node.package.identity)")
-    }
-
-    public func didResolve(term: Term, version: Version, duration: DispatchTimeInterval) {
-        self.log("resolved: \(term.node.package.identity) @ \(version)")
-    }
-
-    public func derived(term: Term) {
-        self.log("derived: \(term.node.package.identity)")
-    }
-
-    public func conflict(conflict: Incompatibility) {
-        self.log("conflict: \(conflict)")
-    }
-
-    public func failedToResolve(incompatibility: Incompatibility) {
-        self.log("failed to resolve: \(incompatibility)")
-    }
-
-    public func satisfied(term: Term, by assignment: Assignment, incompatibility: Incompatibility) {
-        log("CR: \(term) is satisfied by \(assignment)")
-        log("CR: which is caused by \(assignment.cause?.description ?? "")")
-        log("CR: new incompatibility \(incompatibility)")
-    }
-
-    public func partiallySatisfied(term: Term, by assignment: Assignment, incompatibility: Incompatibility, difference: Term) {
-        log("CR: \(term) is partially satisfied by \(assignment)")
-        log("CR: which is caused by \(assignment.cause?.description ?? "")")
-        log("CR: new incompatibility \(incompatibility)")
-    }
-
-    public func solved(result: [DependencyResolver.Binding]) {
-        self.log("solved:")
-        for (package, binding, _) in result {
-            self.log("\(package) \(binding)")
-        }
-    }
-
-    private func log(_ message: String) {
-        self.stream <<< message <<< "\n"
-        self.stream.flush()
-    }
-}
-
 public struct ObservabilityDependencyResolverDelegate: DependencyResolverDelegate {
     private let observabilityScope: ObservabilityScope
 

Sources/PackageLoading/IdentityResolver.swift

@@ -16,9 +16,6 @@ import TSCBasic
 
 // TODO: refactor this when adding registry support
 public protocol IdentityResolver {
-    // deprecated 9/21
-    @available(*, deprecated, message: "use resolveIdentity for url or path instead")
-    func resolveIdentity(for location: String) -> PackageIdentity
     func resolveIdentity(for packageKind: PackageReference.Kind) throws -> PackageIdentity
     func resolveIdentity(for url: URL) throws -> PackageIdentity
     func resolveIdentity(for path: AbsolutePath) throws -> PackageIdentity
@@ -32,13 +29,6 @@ public struct DefaultIdentityResolver: IdentityResolver {
         self.locationMapper = locationMapper
     }
 
-    // deprecated 9/21
-    @available(*, deprecated, message: "use resolveIdentity for url or path instead")
-    public func resolveIdentity(for location: String) -> PackageIdentity {
-        let location = self.mappedLocation(for: location)
-        return PackageIdentity(urlString: location)
-    }
-
     public func resolveIdentity(for packageKind: PackageReference.Kind) throws -> PackageIdentity {
         switch packageKind {
         case .root(let path):