Skip to content
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

[Release Tooling] Stop including 'Info.plist's in static xcframeworks #12243

Merged
merged 3 commits into from
Jan 5, 2024
Merged

[Release Tooling] Stop including 'Info.plist's in static xcframeworks #12243

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4b596d0
[Release Tooling] Stop including 'Info.plist's in static xcframeworks
ncooke3 Jan 5, 2024
db8775d
Add changelog entry
ncooke3 Jan 5, 2024
04d70a1
[skip ci] review
ncooke3 Jan 5, 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
4 changes: 4 additions & 0 deletions FirebaseCore/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# Unreleased
- In preparation for supporting Privacy Manifests, remove `Info.plist` files
ncooke3 marked this conversation as resolved.
Show resolved Hide resolved
from static xcframeworks (#12243).

# Firebase 10.14.0
- For developers building for visionOS, Xcode 15 beta 6 or later is required.

Expand Down
3 changes: 0 additions & 3 deletions ReleaseTooling/Sources/ZipBuilder/CarthageUtils.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,6 @@ extension CarthageUtils {
} catch {
fatalError("Couldn't copy dummy library for Firebase framework in Carthage. \(error)")
}

// Write the Info.plist.
generatePlistContents(forName: "Firebase", withVersion: version, to: frameworkDir)
}

static func generatePlistContents(forName name: String,
Expand Down
17 changes: 2 additions & 15 deletions ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,10 +380,6 @@ struct FrameworkBuilder {
}
umbrellaHeader = umbrellaHeaderURL.lastPathComponent
}
// Add an Info.plist. Required by Carthage and SPM binary xcframeworks.
CarthageUtils.generatePlistContents(forName: frameworkName,
withVersion: podInfo.version,
to: frameworkDir)

// TODO: copy PrivateHeaders directory as well if it exists. SDWebImage is an example pod.

Expand Down Expand Up @@ -594,8 +590,8 @@ struct FrameworkBuilder {
/// Groups slices for each platform into a minimal set of frameworks.
/// - Parameter withName: The framework name.
/// - Parameter isCarthage: Name the temp directory differently for Carthage.
/// - Parameter fromFolder: The almost complete framework folder. Includes Headers, Info.plist,
/// and Resources.
/// - Parameter fromFolder: The almost complete framework folder. Includes
/// Headers, and Resources.
/// - Parameter slicedFrameworks: All the frameworks sliced by platform.
/// - Parameter moduleMapContents: Module map contents for all frameworks in this pod.
private func groupFrameworks(withName framework: String,
Expand Down Expand Up @@ -660,15 +656,6 @@ struct FrameworkBuilder {
fatalError("Could not create framework directory needed to build \(framework): \(error)")
}

// Info.plist from `fromFolder`
do {
let infoPlistSrc = fromFolder.appendingPathComponent("Info.plist").resolvingSymlinksInPath()
let infoPlistDst = platformFrameworkDir.appendingPathComponent("Info.plist")
try fileManager.copyItem(at: infoPlistSrc, to: infoPlistDst)
} catch {
fatalError("Could not create framework directory needed to build \(framework): \(error)")
}

// Copy the binary to the right location.
let binaryName = frameworkPath.lastPathComponent.replacingOccurrences(of: ".framework",
with: "")
Expand Down
Loading