Skip to content

Commit 0fa8498

Browse files
authored
[Release Tooling] Stop including 'Info.plist's in static xcframeworks (#12243)
1 parent 395e0c0 commit 0fa8498

File tree

3 files changed

+8
-18
lines changed

3 files changed

+8
-18
lines changed

FirebaseCore/CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Unreleased
2+
- The following change only applies to those using a binary distribution of
3+
a Firebase SDK(s). In preparation for supporting Privacy Manifests, each
4+
platform framework directory within a static xcframewok no longer contains
5+
an `Info.plist` file (#12243).
6+
17
# Firebase 10.14.0
28
- For developers building for visionOS, Xcode 15 beta 6 or later is required.
39

ReleaseTooling/Sources/ZipBuilder/CarthageUtils.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,9 +241,6 @@ extension CarthageUtils {
241241
} catch {
242242
fatalError("Couldn't copy dummy library for Firebase framework in Carthage. \(error)")
243243
}
244-
245-
// Write the Info.plist.
246-
generatePlistContents(forName: "Firebase", withVersion: version, to: frameworkDir)
247244
}
248245

249246
static func generatePlistContents(forName name: String,

ReleaseTooling/Sources/ZipBuilder/FrameworkBuilder.swift

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -380,10 +380,6 @@ struct FrameworkBuilder {
380380
}
381381
umbrellaHeader = umbrellaHeaderURL.lastPathComponent
382382
}
383-
// Add an Info.plist. Required by Carthage and SPM binary xcframeworks.
384-
CarthageUtils.generatePlistContents(forName: frameworkName,
385-
withVersion: podInfo.version,
386-
to: frameworkDir)
387383

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

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

663-
// Info.plist from `fromFolder`
664-
do {
665-
let infoPlistSrc = fromFolder.appendingPathComponent("Info.plist").resolvingSymlinksInPath()
666-
let infoPlistDst = platformFrameworkDir.appendingPathComponent("Info.plist")
667-
try fileManager.copyItem(at: infoPlistSrc, to: infoPlistDst)
668-
} catch {
669-
fatalError("Could not create framework directory needed to build \(framework): \(error)")
670-
}
671-
672659
// Copy the binary to the right location.
673660
let binaryName = frameworkPath.lastPathComponent.replacingOccurrences(of: ".framework",
674661
with: "")

0 commit comments

Comments
 (0)