From fa5bf192e86e1152aef239c9bb616140b20a094b Mon Sep 17 00:00:00 2001 From: Loris Perret Date: Tue, 5 Dec 2023 16:55:45 +0100 Subject: [PATCH] Delete lang option and add target option --- SampleFiles/resgenConfiguration.yml | 2 +- .../ResgenSwift/Generate/Model/ConfigurationFile.swift | 8 ++++---- .../Generate/Runnable/TagsConfiguration+Runnable.swift | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/SampleFiles/resgenConfiguration.yml b/SampleFiles/resgenConfiguration.yml index 29a6d1a..fbc512a 100644 --- a/SampleFiles/resgenConfiguration.yml +++ b/SampleFiles/resgenConfiguration.yml @@ -72,7 +72,7 @@ colors: tags: - inputFile: ./Tags/sampleTags.txt - lang: ium + target: "matomo firebase" extensionOutputPath: ./Tags/Generated extensionName: Tags extensionSuffix: GenAllScript diff --git a/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift b/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift index 9cf8c47..47ddb79 100644 --- a/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift +++ b/Sources/ResgenSwift/Generate/Model/ConfigurationFile.swift @@ -266,7 +266,7 @@ struct StringsConfiguration: Codable, CustomDebugStringConvertible { struct TagsConfiguration: Codable, CustomDebugStringConvertible { let inputFile: String - let lang: String + let target: String let extensionOutputPath: String let extensionName: String? let extensionSuffix: String? @@ -280,13 +280,13 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible { } internal init(inputFile: String, - lang: String, + target: String, extensionOutputPath: String, extensionName: String?, extensionSuffix: String?, staticMembers: Bool?) { self.inputFile = inputFile - self.lang = lang + self.target = target self.extensionOutputPath = extensionOutputPath self.extensionName = extensionName self.extensionSuffix = extensionSuffix @@ -297,7 +297,7 @@ struct TagsConfiguration: Codable, CustomDebugStringConvertible { """ Tags configuration: - Input file: \(inputFile) - - Lang: \(lang) + - Target: \(target) - Extension output path: \(extensionOutputPath) - Extension name: \(extensionName ?? "-") - Extension suffix: \(extensionSuffix ?? "-") diff --git a/Sources/ResgenSwift/Generate/Runnable/TagsConfiguration+Runnable.swift b/Sources/ResgenSwift/Generate/Runnable/TagsConfiguration+Runnable.swift index 04c6648..198f5ea 100644 --- a/Sources/ResgenSwift/Generate/Runnable/TagsConfiguration+Runnable.swift +++ b/Sources/ResgenSwift/Generate/Runnable/TagsConfiguration+Runnable.swift @@ -17,8 +17,8 @@ extension TagsConfiguration: Runnable { args += [ inputFile.prependIfRelativePath(projectDirectory), - "--lang", - lang, + "--target", + target, "--extension-output-path", extensionOutputPath.prependIfRelativePath(projectDirectory), "--static-members",