Skip to content

[Release Tooling] Only embed bundles containing privacy manifests #12324

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.

Sign up for GitHub

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 2 commits into from
Jan 28, 2024
Merged

[Release Tooling] Only embed bundles containing privacy manifests #12324

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
68da50b
[Release Tooling] Only embed bundles containing privacy manifests
ncooke3 Jan 27, 2024
b64d044
Simplify logic that determines if bundle contains manifest
ncooke3 Jan 27, 2024
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
28 changes: 28 additions & 0 deletions ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -635,6 +635,34 @@ struct FrameworkBuilder {
"\(framework): \(error)")
}

// Move any privacy manifest-containing resource bundles into the
// platform framework.
try? fileManager.contentsOfDirectory(
at: frameworkPath.deletingLastPathComponent(),
includingPropertiesForKeys: nil
)
.filter { $0.pathExtension == "bundle" }
// TODO(ncooke3): Once the zip is built with Xcode 15, the following
// `filter` can be removed. The following block exists to preserve
// how resources (e.g. like FIAM's) are packaged for use in Xcode 14.
.filter { bundleURL in
let dirEnum = fileManager.enumerator(atPath: bundleURL.path)
var containsPrivacyManifest = false
while let relativeFilePath = dirEnum?.nextObject() as? String {
if relativeFilePath.hasSuffix("PrivacyInfo.xcprivacy") {
containsPrivacyManifest = true
break
}
}
return containsPrivacyManifest
}
// Bundles are moved rather than copied to prevent them from being
// packaged in a `Resources` directory at the root of the xcframework.
.forEach { try! fileManager.moveItem(
at: $0,
to: platformFrameworkDir.appendingPathComponent($0.lastPathComponent)
) }

// Headers from slice
do {
let headersSrc: URL = frameworkPath.appendingPathComponent("Headers")
Expand Down