Skip to content

Commit e4ce680

Browse files
authored
Merge pull request #696 from dmonagle/rename-plugin-configuration-argument
Renamed plugin configuration parameter
2 parents 3129697 + 3d44a2f commit e4ce680

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

Plugins/FormatPlugin/plugin.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extension FormatPlugin: CommandPlugin {
4040
let targetNames = argExtractor.extractOption(named: "target")
4141
let targetsToFormat = targetNames.isEmpty ? context.package.targets : try context.package.targets(named: targetNames)
4242

43-
let configurationFilePath = argExtractor.extractOption(named: "configuration").first
43+
let configurationFilePath = argExtractor.extractOption(named: "swift-format-configuration").first
4444

4545
let sourceCodeTargets = targetsToFormat.compactMap{ $0 as? SourceModuleTarget }
4646

@@ -60,7 +60,7 @@ extension FormatPlugin: XcodeCommandPlugin {
6060
let swiftFormatTool = try context.tool(named: "swift-format")
6161

6262
var argExtractor = ArgumentExtractor(arguments)
63-
let configurationFilePath = argExtractor.extractOption(named: "configuration").first
63+
let configurationFilePath = argExtractor.extractOption(named: "swift-format-configuration").first
6464

6565
try format(
6666
tool: swiftFormatTool,

Plugins/LintPlugin/plugin.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ extension LintPlugin: CommandPlugin {
4141
let targetNames = argExtractor.extractOption(named: "target")
4242

4343
let targetsToFormat = targetNames.isEmpty ? context.package.targets : try context.package.targets(named: targetNames)
44-
let configurationFilePath = argExtractor.extractOption(named: "configuration").first
44+
let configurationFilePath = argExtractor.extractOption(named: "swift-format-configuration").first
4545

4646
let sourceCodeTargets = targetsToFormat.compactMap { $0 as? SourceModuleTarget }
4747

@@ -60,7 +60,7 @@ extension LintPlugin: XcodeCommandPlugin {
6060
func performCommand(context: XcodeProjectPlugin.XcodePluginContext, arguments: [String]) throws {
6161
let swiftFormatTool = try context.tool(named: "swift-format")
6262
var argExtractor = ArgumentExtractor(arguments)
63-
let configurationFilePath = argExtractor.extractOption(named: "configuration").first
63+
let configurationFilePath = argExtractor.extractOption(named: "swift-format-configuration").first
6464

6565
try lint(
6666
tool: swiftFormatTool,

0 commit comments

Comments
 (0)