From 0b0407bead7ebaac0b2beb1847842b5b5b048a54 Mon Sep 17 00:00:00 2001 From: Ian Leitch Date: Sun, 7 Jul 2024 17:45:00 +0200 Subject: [PATCH] Remove deprecation warning for '--external-encodable-protocols', it was reintroduced in #736 --- Sources/Frontend/Commands/ScanCommand.swift | 6 +----- Sources/Shared/Configuration.swift | 4 ---- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Sources/Frontend/Commands/ScanCommand.swift b/Sources/Frontend/Commands/ScanCommand.swift index 64d20590c..7a03ebba5 100644 --- a/Sources/Frontend/Commands/ScanCommand.swift +++ b/Sources/Frontend/Commands/ScanCommand.swift @@ -66,7 +66,7 @@ struct ScanCommand: FrontendCommand { @Option(parsing: .upToNextOption, help: "Property types to retain if the property is assigned, but never read") var retainAssignOnlyPropertyTypes: [String] = defaultConfiguration.$retainAssignOnlyPropertyTypes.defaultValue - @Option(parsing: .upToNextOption, help: .private) + @Option(parsing: .upToNextOption, help: "Names of external protocols that inherit Encodable. Properties and CodingKey enums of types conforming to these protocols will be retained") var externalEncodableProtocols: [String] = defaultConfiguration.$externalEncodableProtocols.defaultValue @Option(parsing: .upToNextOption, help: "Names of external protocols that inherit Codable. Properties and CodingKey enums of types conforming to these protocols will be retained") @@ -135,10 +135,6 @@ struct ScanCommand: FrontendCommand { try scanBehavior.setup(config).get() } - if !externalEncodableProtocols.isEmpty { - Logger().warn("The option '--external-encodable-protocols' is deprecated, use '--external-codable-protocols' instead.") - } - let configuration = Configuration.shared configuration.guidedSetup = setup configuration.apply(\.$workspace, workspace) diff --git a/Sources/Shared/Configuration.swift b/Sources/Shared/Configuration.swift index a9fd0757c..3511632a6 100644 --- a/Sources/Shared/Configuration.swift +++ b/Sources/Shared/Configuration.swift @@ -127,7 +127,6 @@ public final class Configuration { // Non user facing. public var guidedSetup: Bool = false - public var removalOutputBasePath: FilePath? // Dependencies. private var logger: BaseLogger // Must use BaseLogger as Logger depends upon Configuration. @@ -330,9 +329,6 @@ public final class Configuration { case $retainAssignOnlyPropertyTypes.key: $retainAssignOnlyPropertyTypes.assign(value) case $externalEncodableProtocols.key: - if !externalEncodableProtocols.isEmpty { - logger.warn("The option '--external-encodable-protocols' is deprecated, use '--external-codable-protocols' instead.") - } $externalEncodableProtocols.assign(value) case $externalCodableProtocols.key: $externalCodableProtocols.assign(value)