Skip to content

Reinstate 5.3 behavior of target-based dependency resolution #3162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 7, 2021
Merged
Show file tree
Hide file tree
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
4 changes: 0 additions & 4 deletions Sources/PackageGraph/DependencyResolutionNode.swift
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ public enum DependencyResolutionNode {

/// Assembles the product filter to use on the manifest for this node to determine its dependencies.
public var productFilter: ProductFilter {
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
switch self {
case .empty:
return .specific([])
Expand All @@ -87,9 +86,6 @@ public enum DependencyResolutionNode {
case .root:
return .everything
}
#else
return .everything
#endif
}

/// Returns the dependency that a product has on its own package, if relevant.
Expand Down
22 changes: 20 additions & 2 deletions Sources/PackageModel/Manifest.swift
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,13 @@ public final class Manifest: ObjectIdentifierProtocol {
return targets
}
#else
return self.targets
return packageKind == .root ? self.targets : targetsRequired(for: products)
#endif
}

/// Returns the package dependencies required for a particular products filter.
public func dependenciesRequired(for productFilter: ProductFilter) -> [PackageDependencyDescription] {
#if ENABLE_TARGET_BASED_DEPENDENCY_RESOLUTION
// If we have already calcualted it, returned the cached value.
if let dependencies = _requiredDependencies[productFilter] {
return dependencies
Expand All @@ -163,6 +164,23 @@ public final class Manifest: ObjectIdentifierProtocol {
_requiredDependencies[productFilter] = dependencies
return dependencies
}
#else
guard toolsVersion >= .v5_2 && productFilter != .everything else {
return dependencies
}

var requiredDependencies: Set<PackageDependencyDescription> = []

for target in targetsRequired(for: products) {
for targetDependency in target.dependencies {
if let dependency = packageDependency(referencedBy: targetDependency) {
requiredDependencies.insert(dependency)
}
}
}

return Array(requiredDependencies)
#endif
}

/// Returns the targets required for building the provided products.
Expand Down Expand Up @@ -190,7 +208,7 @@ public final class Manifest: ObjectIdentifierProtocol {
/// Returns the package dependencies required for building the provided targets.
///
/// The returned dependencies have their particular product filters registered. (To determine product filters without removing any dependencies from the list, specify `keepUnused: true`.)
public func dependenciesRequired(
private func dependenciesRequired(
for targets: [TargetDescription],
keepUnused: Bool = false
) -> [PackageDependencyDescription] {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import TSCBasic

/// Represents a package dependency.
public struct PackageDependencyDescription: Equatable, Codable {
public struct PackageDependencyDescription: Equatable, Codable, Hashable {

/// The dependency requirement.
public enum Requirement: Equatable, Hashable {
Expand Down