Skip to content
Draft
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 60 additions & 1 deletion Sources/Commands/PackageCommands/AddDependency.swift
Original file line number Diff line number Diff line change
Expand Up @@ -231,14 +231,73 @@ extension SwiftPackageCommand {
)
}

private func findAllManifests(packagePath: Basics.AbsolutePath, fileSystem: Basics.FileSystem) -> [Basics.AbsolutePath] {
var manifests: [Basics.AbsolutePath] = []

// Add standard manifest if it exists
let standardManifest = packagePath.appending(component: Manifest.filename)
let manifestContents: ByteString
if fileSystem.isFile(standardManifest) {
manifests.append(standardManifest)
}

// Find version specific manifests
do {
let packageContents = try fileSystem.getDirectoryContents(packagePath)
let regexManifestFile = try! RegEx(pattern: #"^Package@swift-(\d+)(?:\.(\d+))?(?:\.(\d+))?.swift$"#)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: Is there some reusable regex or function that can find all of the package manifests?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, sadly there is not a reusable regex. Furthermore, the only function that is used for finding package manifests only returns one (which is required for the manifest loader, as you would not load multiple manifests)


for file in packageContents {
if regexManifestFile.matchGroups(in: file).first != nil {
manifests.append(packagePath.appending(component: file))
}
}
} catch {
// If we cannot read directory, just use standard manifest
}
return manifests
}


private func applyEdits(
packagePath: Basics.AbsolutePath,
workspace: Workspace,
packageDependency: PackageDependency
) throws {
// Load the manifest file
let fileSystem = workspace.fileSystem
let manifestPath = packagePath.appending(component: Manifest.filename)
let packageManifests = findAllManifests(packagePath: packagePath, fileSystem: workspace.fileSystem)

guard !packageManifests.isEmpty else {
throw StringError("cannot find package manifest in \(packagePath)")
}

var successCount = 0
var errors: [String] = []

for manifest in packageManifests {
do {
try applyEditsToSingleManifest(manifestPath: manifest, fileSystem: fileSystem, packageDependency: packageDependency)
successCount += 1
} catch {
let errorMessage = "Failed to update \(manifest.basename)"
errors.append(errorMessage)
}
}

if successCount == 0 {
throw StringError("Failed to update any manifest files:\n" + errors.joined(separator: "\n"))
} else if !errors.isEmpty {
print("Successfully updated \(successCount)/\(packageManifests.count) manifest files")
print("Warnings/Errors occured:\n" + errors.joined(separator: "\n"))
}
}

private func applyEditsToSingleManifest(
manifestPath: Basics.AbsolutePath,
fileSystem: FileSystem,
packageDependency: PackageDependency
) throws {
// Load the manifest file
let manifestContents: ByteString
do {
manifestContents = try fileSystem.readFileContents(manifestPath)
Expand Down