diff --git a/Package.swift b/Package.swift index 97a5a04..2e41129 100644 --- a/Package.swift +++ b/Package.swift @@ -14,9 +14,13 @@ let package = Package( targets: [ .binaryTarget( name: "package-generator-cli", - url: "https://github.com/mackoj/PackageGeneratorCLI/releases/download/0.5.0/package-generator-cli-arm64-apple-macosx.artifactbundle.zip", - checksum: "8ffa941438b678085c45e6caab195cdb0a6b4a6fb6e4425589869a1a2dc1e8da" + url: "https://github.com/mackoj/PackageGeneratorCLI/releases/download/0.5.1/package-generator-cli-arm64-apple-macosx.artifactbundle.zip", + checksum: "758615aeda296df2870341b311eaac5deb518a2f9a2e1c438520901f96d0fa74" ), +// .binaryTarget( +// name: "package-generator-cli", +// path: "../PackageGeneratorCLI/package-generator-cli-arm64-apple-macosx.artifactbundle.zip" +// ), .plugin( name: "Package Generator", capability: .command( diff --git a/Plugins/PackageGenerator/PackageGenerator.swift b/Plugins/PackageGenerator/PackageGenerator.swift index ec58a38..c9e58bc 100644 --- a/Plugins/PackageGenerator/PackageGenerator.swift +++ b/Plugins/PackageGenerator/PackageGenerator.swift @@ -328,6 +328,7 @@ struct PackageGenerator { var last: String = "" for parsedPackage in parsedPackages.sorted(by: \.name, order: <) { + if parsedPackage.isTest { continue } if last.isEmpty == false { outputFileHandle.write("\(last),\n".data(using: .utf8)!) } @@ -365,6 +366,7 @@ struct PackageGenerator { private static func fakeTargetToSwiftCode(_ fakeTarget: ParsedPackage, _ configuration: PackageGeneratorConfiguration) -> String { let spaces = String(repeating: " ", count: configuration.spaces) + let name = fakeTarget.name + (fakeTarget.isTest ? "Tests" : "") let localDependencies = fakeTarget.dependencies var dependencies = "" if localDependencies.isEmpty == false { @@ -372,7 +374,7 @@ struct PackageGenerator { } var otherParameters = "" - if let targetParameters = configuration.targetsParameters?[fakeTarget.name], targetParameters.isEmpty == false { + if let targetParameters = configuration.targetsParameters?[name], targetParameters.isEmpty == false { otherParameters = ",\n" + targetParameters.map { "\(spaces)\(spaces)\($0)" } .joined(separator: ",\n") } @@ -381,7 +383,7 @@ struct PackageGenerator { return """ \(spaces).\(fakeTarget.isTest ? "testTarget" : "target")( - \(spaces)\(spaces)name: "\(fakeTarget.name)",\(isLeaf)\(dependencies) + \(spaces)\(spaces)name: "\(name)",\(isLeaf)\(dependencies) \(spaces)\(spaces)path: "\(fakeTarget.path)"\(otherParameters) \(spaces)) """