@@ -32,7 +32,6 @@ extension ModulesGraph {
32
32
customPlatformsRegistry: PlatformRegistry ? = . none,
33
33
customXCTestMinimumDeploymentTargets: [ PackageModel . Platform : PlatformVersion ] ? = . none,
34
34
testEntryPointPath: AbsolutePath ? = nil ,
35
- availableLibraries: [ LibraryMetadata ] ,
36
35
fileSystem: FileSystem ,
37
36
observabilityScope: ObservabilityScope
38
37
) throws -> ModulesGraph {
@@ -160,7 +159,6 @@ extension ModulesGraph {
160
159
unsafeAllowedPackages: unsafeAllowedPackages,
161
160
platformRegistry: customPlatformsRegistry ?? . default,
162
161
platformVersionProvider: platformVersionProvider,
163
- availableLibraries: availableLibraries,
164
162
fileSystem: fileSystem,
165
163
observabilityScope: observabilityScope
166
164
)
@@ -250,7 +248,6 @@ private func createResolvedPackages(
250
248
unsafeAllowedPackages: Set < PackageReference > ,
251
249
platformRegistry: PlatformRegistry ,
252
250
platformVersionProvider: PlatformVersionProvider ,
253
- availableLibraries: [ LibraryMetadata ] ,
254
251
fileSystem: FileSystem ,
255
252
observabilityScope: ObservabilityScope
256
253
) throws -> [ ResolvedPackage ] {
@@ -529,32 +526,26 @@ private func createResolvedPackages(
529
526
t. name != productRef. name
530
527
}
531
528
532
- let identitiesAvailableInSDK = availableLibraries. flatMap { $0. identities. map { $0. identity } }
533
- // TODO: Do we have to care about "name" vs. identity here?
534
- if let name = productRef. package , identitiesAvailableInSDK. contains ( PackageIdentity . plain ( name) ) {
535
- // Do not emit any diagnostic.
536
- } else {
537
- // Find a product name from the available product dependencies that is most similar to the required product name.
538
- let bestMatchedProductName = bestMatch ( for: productRef. name, from: Array ( allTargetNames) )
539
- var packageContainingBestMatchedProduct : String ?
540
- if let bestMatchedProductName, productRef. name == bestMatchedProductName {
541
- let dependentPackages = packageBuilder. dependencies. map ( \. package )
542
- for p in dependentPackages where p. targets. contains ( where: { $0. name == bestMatchedProductName } ) {
543
- packageContainingBestMatchedProduct = p. identity. description
544
- break
545
- }
529
+ // Find a product name from the available product dependencies that is most similar to the required product name.
530
+ let bestMatchedProductName = bestMatch ( for: productRef. name, from: Array ( allTargetNames) )
531
+ var packageContainingBestMatchedProduct : String ?
532
+ if let bestMatchedProductName, productRef. name == bestMatchedProductName {
533
+ let dependentPackages = packageBuilder. dependencies. map ( \. package )
534
+ for p in dependentPackages where p. targets. contains ( where: { $0. name == bestMatchedProductName } ) {
535
+ packageContainingBestMatchedProduct = p. identity. description
536
+ break
546
537
}
547
- let error = PackageGraphError . productDependencyNotFound (
548
- package : package . identity. description,
549
- targetName: targetBuilder. target. name,
550
- dependencyProductName: productRef. name,
551
- dependencyPackageName: productRef. package ,
552
- dependencyProductInDecl: !declProductsAsDependency. isEmpty,
553
- similarProductName: bestMatchedProductName,
554
- packageContainingSimilarProduct: packageContainingBestMatchedProduct
555
- )
556
- packageObservabilityScope. emit ( error)
557
538
}
539
+ let error = PackageGraphError . productDependencyNotFound (
540
+ package : package . identity. description,
541
+ targetName: targetBuilder. target. name,
542
+ dependencyProductName: productRef. name,
543
+ dependencyPackageName: productRef. package ,
544
+ dependencyProductInDecl: !declProductsAsDependency. isEmpty,
545
+ similarProductName: bestMatchedProductName,
546
+ packageContainingSimilarProduct: packageContainingBestMatchedProduct
547
+ )
548
+ packageObservabilityScope. emit ( error)
558
549
}
559
550
continue
560
551
}
0 commit comments