Remove API that was deprecated during the 5.10 release (#1029)

d-ronnqvist · web-flow · commit f66f704fc987 · 2024-09-25T10:57:23.000+02:00
diff --git a/Sources/SwiftDocC/Indexing/Navigator/NavigatorIndex.swift b/Sources/SwiftDocC/Indexing/Navigator/NavigatorIndex.swift
@@ -65,9 +65,6 @@ public class NavigatorIndex {
         /// Missing bundle identifier.
         case missingBundleIdentifier
         
-        @available(*, deprecated, renamed: "missingBundleIdentifier", message: "Use 'missingBundleIdentifier' instead. This deprecated API will be removed after 6.0 is released")
-        case missingBundleIndentifier
-        
         /// A RenderNode has no title and won't be indexed.
         case missingTitle(description: String)
         
@@ -76,7 +73,7 @@ public class NavigatorIndex {
         
         public var errorDescription: String {
             switch self {
-            case .missingBundleIdentifier, .missingBundleIndentifier:
+            case .missingBundleIdentifier:
                 return "A navigator index requires a bundle identifier, which is missing."
             case .missingTitle:
                 return "The page has no valid title available."
diff --git a/Sources/SwiftDocC/Infrastructure/Diagnostics/DiagnosticConsoleWriter.swift b/Sources/SwiftDocC/Infrastructure/Diagnostics/DiagnosticConsoleWriter.swift
@@ -75,12 +75,6 @@ public final class DiagnosticConsoleWriter: DiagnosticFormattingConsumer {
         self.diagnosticFormatter.finalize()
     }
     
-    // This is deprecated but still necessary to implement.
-    @available(*, deprecated, renamed: "flush()", message: "Use 'flush()' instead. This deprecated API will be removed after 6.0 is released")
-    public func finalize() throws {
-        try flush()
-    }
-    
     private static func makeDiagnosticFormatter(
         _ options: DiagnosticFormattingOptions,
         baseURL: URL?,
diff --git a/Sources/SwiftDocC/Infrastructure/Diagnostics/DiagnosticConsumer.swift b/Sources/SwiftDocC/Infrastructure/Diagnostics/DiagnosticConsumer.swift
@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -16,10 +16,6 @@ public protocol DiagnosticConsumer: AnyObject {
     /// - Parameter problems: The encountered diagnostics.
     func receive(_ problems: [Problem])
     
-    /// Inform the consumer that the engine has sent all diagnostics for this build.
-    @available(*, deprecated, renamed: "flush()", message: "Use 'flush()' instead. This deprecated API will be removed after 6.0 is released")
-    func finalize() throws
-    
     /// Inform the consumer that the engine has sent all diagnostics in a given context.
     func flush() throws
 }
@@ -29,11 +25,3 @@ public protocol DiagnosticFormattingConsumer: DiagnosticConsumer {
     /// Options for how problems should be formatted if written to output.
     var formattingOptions: DiagnosticFormattingOptions { get set }
 }
-
-public extension DiagnosticConsumer {
-    // Deprecated for suppressing the warning emitted when calling `finalize()`
-    @available(*, deprecated, message: "This deprecated API will be removed after 6.0 is released")
-    func flush() throws {
-        try finalize()
-    }
-}
diff --git a/Sources/SwiftDocC/Infrastructure/Diagnostics/DiagnosticEngine.swift b/Sources/SwiftDocC/Infrastructure/Diagnostics/DiagnosticEngine.swift
@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021-2022 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -105,11 +105,6 @@ public final class DiagnosticEngine {
         }
     }
     
-    @available(*, deprecated, renamed: "flush()", message: "Use 'flush()' instead. This deprecated API will be removed after 6.0 is released")
-    public func finalize() {
-        flush()
-    }
-    
     public func flush() {
         workQueue.sync {
             for consumer in self.consumers.sync({ $0.values }) {
diff --git a/Sources/SwiftDocC/Infrastructure/External Data/Deprecated/DocumentationContext+DeprecatedResolvers.swift b/Sources/SwiftDocC/Infrastructure/External Data/Deprecated/DocumentationContext+DeprecatedResolvers.swift
diff --git a/Sources/SwiftDocC/Infrastructure/External Data/Deprecated/OutOfProcessReferenceResolver+DeprecatedResolvers.swift b/Sources/SwiftDocC/Infrastructure/External Data/Deprecated/OutOfProcessReferenceResolver+DeprecatedResolvers.swift
diff --git a/Sources/SwiftDocC/Infrastructure/Workspace/DefaultAvailability.swift b/Sources/SwiftDocC/Infrastructure/Workspace/DefaultAvailability.swift
@@ -64,12 +64,6 @@ public struct DefaultAvailability: Codable, Equatable {
         /// The availability version state information, e.g unavailable
         internal var versionInformation: VersionInformation
 
-        /// A string representation of the version for this platform.
-        @available(*, deprecated, message: "Use `introducedVersion` instead.  This deprecated API will be removed after 6.0 is released", renamed: "introducedVersion")
-        public var platformVersion: String {
-            return introducedVersion ?? "0.0"
-        }
-        
         /// A string representation of the version for this platform
         /// or nil if it's unavailable.
         public var introducedVersion: String? {
diff --git a/Sources/SwiftDocC/Model/Rendering/Variants/RenderNodeVariantOverridesApplier.swift b/Sources/SwiftDocC/Model/Rendering/Variants/RenderNodeVariantOverridesApplier.swift
@@ -42,15 +42,4 @@ public struct RenderNodeVariantOverridesApplier {
     private struct RenderNodeVariantsProxy: Codable {
         var variantOverrides: VariantOverrides?
     }
-    
-    @available(*, deprecated, message: "This error is never raised. This deprecated API will be removed after 6.0 is released")
-    public enum Error: DescribedError {
-        case corruptedRenderNode
-        public var errorDescription: String {
-            switch self {
-            case .corruptedRenderNode:
-                return "Corrupted or malformed render node value."
-            }
-        }
-    }
 }
diff --git a/Sources/SwiftDocC/Semantics/Symbol/Symbol.swift b/Sources/SwiftDocC/Semantics/Symbol/Symbol.swift
@@ -595,10 +595,6 @@ extension Symbol {
     
     /// The first variant of the symbol's platform, if available.
     public var platformName: PlatformName? { platformNameVariants.firstValue }
-    
-    /// The first variant of the symbol's extended module, if available
-    @available(*, deprecated, message: "Use 'extendedModuleVariants' instead. This deprecated API will be removed after 6.0 is released")
-    public var extendedModule: String? { extendedModuleVariants.firstValue }
 
     /// Whether the first variant of the symbol is required in its context.
     public var isRequired: Bool {
diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift b/Sources/SwiftDocCUtilities/ArgumentParsing/ActionExtensions/ConvertAction+CommandInitialization.swift
@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -44,9 +44,7 @@ extension ConvertAction {
         // into a dictionary. This will throw with a descriptive error upon failure.
         let parsedPlatforms = try PlatformArgumentParser.parse(convert.platforms)
 
-        let additionalSymbolGraphFiles = (convert as _DeprecatedSymbolGraphFilesAccess).additionalSymbolGraphFiles + symbolGraphFiles(
-            in: convert.additionalSymbolGraphDirectory
-        )
+        let additionalSymbolGraphFiles = symbolGraphFiles(in: convert.additionalSymbolGraphDirectory)
         
         let bundleDiscoveryOptions = BundleDiscoveryOptions(
             fallbackDisplayName: convert.fallbackBundleDisplayName,
@@ -104,8 +102,3 @@ private func symbolGraphFiles(in directory: URL?) -> [URL] {
     return subpaths.map { directory.appendingPathComponent($0) }
         .filter { DocumentationBundleFileTypes.isSymbolGraphFile($0) }
 }
-
-private protocol _DeprecatedSymbolGraphFilesAccess {
-    var additionalSymbolGraphFiles: [URL] { get }
-}
-extension Docc.Convert: _DeprecatedSymbolGraphFilesAccess {}
diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationBundleOption.swift b/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationBundleOption.swift
@@ -1,7 +1,7 @@
 /*
  This source file is part of the Swift.org open source project
 
- Copyright (c) 2021-2023 Apple Inc. and the Swift project authors
+ Copyright (c) 2021-2024 Apple Inc. and the Swift project authors
  Licensed under Apache License v2.0 with Runtime Library Exception
 
  See https://swift.org/LICENSE.txt for license information
@@ -25,6 +25,3 @@ public struct DocumentationCatalogOption: DirectoryPathOption {
         transform: URL.init(fileURLWithPath:))
     public var url: URL?
 }
-
-@available(*, deprecated, renamed: "DocumentationCatalogOption", message: "Use 'DocumentationCatalogOption' instead. This deprecated API will be removed after 6.0 is released")
-public typealias DocumentationBundleOption = DocumentationCatalogOption
diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift b/Sources/SwiftDocCUtilities/ArgumentParsing/Options/DocumentationCoverageOptionsArgument.swift
@@ -40,10 +40,6 @@ public struct DocumentationCoverageOptionsArgument: ParsableArguments {
         valueName: "symbol-kind")
     )
     var summaryLevel: DocumentationCoverageLevel = .brief
-    
-    @Option(help: .hidden)
-    @available(*, deprecated, renamed: "summaryLevel", message: "Use 'summaryLevel' instead. This deprecated API will be removed after 6.0 is released")
-    public var level: DocumentationCoverageLevel = .none
 
     var effectiveSummaryLevel: DocumentationCoverageLevel {
         guard experimentalDocumentationCoverage else {
@@ -69,19 +65,9 @@ public struct DocumentationCoverageOptionsArgument: ParsableArguments {
     )
     public var symbolKindFilter: [DocumentationCoverageOptions.KindFilterOptions.BitFlagRepresentation] = []
     
-    @Option(parsing: ArrayParsingStrategy.upToNextOption, help: .hidden)
-    @available(*, deprecated, renamed: "symbolKindFilter", message: "Use 'symbolKindFilter' instead. This deprecated API will be removed after 6.0 is released")
-    public var kinds: [DocumentationCoverageOptions.KindFilterOptions.BitFlagRepresentation] = []
-    
-    @available(*, deprecated) // This deprecation silences the access of the deprecated `level` and `kind` options.
     public mutating func validate() throws {
         Docc.Convert.warnAboutDeprecatedOptionIfNeeded("level", message: "Use '--coverage-summary-level' instead.")
         Docc.Convert.warnAboutDeprecatedOptionIfNeeded("kinds", message: "Use '--coverage-symbol-kind-filter' instead.")
-        
-        if !ProcessInfo.processInfo.arguments.contains("--coverage-summary-level"), level != .none {
-            summaryLevel = level
-        }
-        symbolKindFilter.append(contentsOf: kinds)
     }
 }
 
diff --git a/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Convert.swift b/Sources/SwiftDocCUtilities/ArgumentParsing/Subcommands/Convert.swift
diff --git a/Tests/SwiftDocCTests/Diagnostics/DiagnosticEngineTests.swift b/Tests/SwiftDocCTests/Diagnostics/DiagnosticEngineTests.swift
diff --git a/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift b/Tests/SwiftDocCUtilitiesTests/ArgumentParsing/ConvertSubcommandTests.swift
