Skip to content

Commit

Permalink
Fix SwiftPackageManager dependencies filtering when it needs to ignor…
Browse files Browse the repository at this point in the history
…e macCatalyst (tuist#4610)
  • Loading branch information
DevYeom committed Aug 24, 2022
1 parent bdf582c commit f3fa123
Showing 1 changed file with 19 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,10 @@ public final class SwiftPackageManagerGraphGenerator: SwiftPackageManagerGraphGe
let packageInfos: [
(id: String, name: String, folder: AbsolutePath, targetToArtifactPaths: [String: AbsolutePath], info: PackageInfo)
]

// Platforms include only iOS
let shouldIgnoreMacCatalyst = platforms.subtracting([.iOS]).isEmpty

packageInfos = try workspaceState.object.dependencies.map(context: .concurrent) { dependency in
let name = dependency.packageRef.name
let packageFolder: AbsolutePath
Expand All @@ -102,7 +106,21 @@ public final class SwiftPackageManagerGraphGenerator: SwiftPackageManagerGraphGe
throw SwiftPackageManagerGraphGeneratorError.unsupportedDependencyKind(dependency.packageRef.kind)
}

let packageInfo = try swiftPackageManagerController.loadPackageInfo(at: packageFolder)
let packageInfo: PackageInfo
if shouldIgnoreMacCatalyst {
let originalPackageInfo = try swiftPackageManagerController.loadPackageInfo(at: packageFolder)
let filteredPlatforms = originalPackageInfo.platforms.filter { $0.platformName != "maccatalyst" }
packageInfo = PackageInfo(
products: originalPackageInfo.products,
targets: originalPackageInfo.targets,
platforms: filteredPlatforms,
cLanguageStandard: originalPackageInfo.cLanguageStandard,
cxxLanguageStandard: originalPackageInfo.cxxLanguageStandard,
swiftLanguageVersions: originalPackageInfo.swiftLanguageVersions
)
} else {
packageInfo = try swiftPackageManagerController.loadPackageInfo(at: packageFolder)
}
let targetToArtifactPaths = workspaceState.object.artifacts
.filter { $0.packageRef.identity == dependency.packageRef.identity }
.reduce(into: [:]) { result, artifact in
Expand Down

0 comments on commit f3fa123

Please sign in to comment.