Skip to content

[Release Tooling] Copy over macOS/macCatalyst plists #12517

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 3 commits into from
Mar 11, 2024
Merged

[Release Tooling] Copy over macOS/macCatalyst plists #12517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c126bd
[Release Tooling] Copy over macOS/macCatalyst plists
ncooke3 Mar 11, 2024
8efcf3c
[skip ci] Style
ncooke3 Mar 11, 2024
e18b97b
[skip ci] Update changelog entry
ncooke3 Mar 11, 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
3 changes: 3 additions & 0 deletions FirebaseCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# Unreleased
- Fix validation issue for macOS and macCatalyst XCFrameworks. (#12505)

# Firebase 10.22.1
- [Swift Package Manager / CocoaPods] Fix app validation issues on Xcode 15.3
for those using the `FirebaseAnalyticsOnDeviceConversion` SDK. This issue was
Expand Down
17 changes: 15 additions & 2 deletions ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -674,7 +674,18 @@ struct FrameworkBuilder {
let binaryName = frameworkPath.lastPathComponent.replacingOccurrences(of: ".framework",
with: "")
let fatBinary = frameworkPath.appendingPathComponent(binaryName).resolvingSymlinksInPath()
let infoPlist = frameworkPath.appendingPathComponent("Info.plist").resolvingSymlinksInPath()
let plistPathComponents = {
if platform == .catalyst || platform == .macOS {
// Frameworks for macOS and macCatalyst have a different directory
// structure so the framework-level `Info.plist` is found in a
// different spot.
return ["Versions", "A", "Resources", "Info.plist"]
} else {
return ["Info.plist"]
}
}()
let infoPlist = frameworkPath.appendingPathComponents(plistPathComponents)
.resolvingSymlinksInPath()
let infoPlistDestination = platformFrameworkDir.appendingPathComponent("Info.plist")
let fatBinaryDestination = platformFrameworkDir.appendingPathComponent(framework)
do {
Expand All @@ -698,7 +709,9 @@ struct FrameworkBuilder {

try updatedPlistData.write(to: infoPlistDestination)
} catch {
// The Catalyst and macos Info.plist's are in another location. Ignore failure.
fatalError(
"Could not copy framework-level plist to framework directory for \(framework): \(error)"
)
}

// Use the appropriate moduleMaps
Expand Down