Skip to content

Commit 54d9721

Browse files
committed
updates
1 parent 4766a66 commit 54d9721

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Sources/PackageGraph/PackageGraph+Loading.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -817,12 +817,12 @@ extension Target {
817817

818818
func validateDependency(target: Target) throws {
819819
if self.type == .plugin && target.type == .library {
820-
throw PackageGraphError.unsupported(targetName: self.name, targetType: self.type.rawValue, dependencyName: target.name, dependencyType: target.type.rawValue, dependencyPackage: nil)
820+
throw PackageGraphError.unsupportedPluginDependency(targetName: self.name, dependencyName: target.name, dependencyType: target.type.rawValue, dependencyPackage: nil)
821821
}
822822
}
823823
func validateDependency(product: Product, productPackage: PackageIdentity) throws {
824824
if self.type == .plugin && product.type.isLibrary {
825-
throw PackageGraphError.unsupported(targetName: self.name, targetType: self.type.rawValue, dependencyName: product.name, dependencyType: product.type.description, dependencyPackage: productPackage.description)
825+
throw PackageGraphError.unsupportedPluginDependency(targetName: self.name, dependencyName: product.name, dependencyType: product.type.description, dependencyPackage: productPackage.description)
826826
}
827827
}
828828
}

Sources/PackageGraph/PackageGraph.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ enum PackageGraphError: Swift.Error {
3636
targetName: String,
3737
packageIdentifier: String
3838
)
39-
/// Dependency between a given target of its type and a dependent target/product of its type is unsupported
40-
case unsupported(targetName: String, targetType: String, dependencyName: String, dependencyType: String, dependencyPackage: String?)
39+
/// Dependency between a plugin and a dependent target/product of a given type is unsupported
40+
case unsupportedPluginDependency(targetName: String, dependencyName: String, dependencyType: String, dependencyPackage: String?)
4141
/// A product was found in multiple packages.
4242
case duplicateProduct(product: String, packages: [String])
4343

@@ -255,12 +255,12 @@ extension PackageGraphError: CustomStringConvertible {
255255
return "multiple aliases: ['\(aliases.joined(separator: "', '"))'] found for target '\(target)' in product '\(product)' from package '\(package)'"
256256
case .invalidSourcesForModuleAliasing(let target, let product, let package):
257257
return "module aliasing can only be used for Swift based targets; non-Swift sources found in target '\(target)' for product '\(product)' from package '\(package)'"
258-
case .unsupported(let targetName, let targetType, let dependencyName, let dependencyType, let dependencyPackage):
258+
case .unsupportedPluginDependency(let targetName, let dependencyName, let dependencyType, let dependencyPackage):
259259
var trailingMsg = ""
260260
if let depPkg = dependencyPackage {
261261
trailingMsg = " from package '\(depPkg)'"
262262
}
263-
return "target '\(targetName)' of type '\(targetType)' cannot depend on '\(dependencyName)' of type '\(dependencyType)'\(trailingMsg); this dependency is unsupported"
263+
return "plugin '\(targetName)' cannot depend on '\(dependencyName)' of type '\(dependencyType)'\(trailingMsg); this dependency is unsupported"
264264
}
265265
}
266266
}

0 commit comments

Comments
 (0)