diff --git a/.bump-version.json b/.bump-version.json index 776c3dd..730d942 100644 --- a/.bump-version.json +++ b/.bump-version.json @@ -1,12 +1,14 @@ { "strategy" : { - "branch" : { - "includeCommitSha": true + "semvar" : { + "preRelease" : { + "strategy" : { "gitTag" : {} } + } } }, "target" : { "module" : { - "name" : "cli-version" + "name" : "bump-version" } } } diff --git a/Sources/CliClient/Internal/ConfigurationExtensions.swift b/Sources/CliClient/Internal/ConfigurationExtensions.swift index c20f842..a393e6a 100644 --- a/Sources/CliClient/Internal/ConfigurationExtensions.swift +++ b/Sources/CliClient/Internal/ConfigurationExtensions.swift @@ -47,7 +47,7 @@ extension Configuration.Target { path = "Sources/\(path)" } - filePath = "\(path)/\(module.fileName)" + filePath = "\(path)/\(module.fileNameOrDefault)" } if let gitDirectory { diff --git a/Sources/ConfigurationClient/Configuration.swift b/Sources/ConfigurationClient/Configuration.swift index 530b829..f82b2f5 100644 --- a/Sources/ConfigurationClient/Configuration.swift +++ b/Sources/ConfigurationClient/Configuration.swift @@ -150,13 +150,13 @@ public extension Configuration { /// Represents a module target for a version file. /// - public struct Module: Codable, Equatable, Sendable { + public struct Module: Codable, Equatable, Sendable, CustomDumpReflectable { /// The module directory name. public let name: String /// The version file name located in the module directory. - public let fileName: String + public let fileName: String? /// Create a new module target. /// @@ -165,12 +165,27 @@ public extension Configuration { /// - fileName: The file name located in the module directory. public init( _ name: String, - fileName: String = "Version.swift" + fileName: String? = "Version.swift" ) { self.name = name self.fileName = fileName } + public var fileNameOrDefault: String { + fileName ?? "Version.swift" + } + + public var customDumpMirror: Mirror { + .init( + self, + children: [ + "name": name, + "fileName": fileNameOrDefault + ], + displayStyle: .struct + ) + } + } public var customDumpMirror: Mirror {