Conversation
Generated by 🚫 Danger |
| // Get the framework Headers directory. On macOS, it's a symbolic link. | ||
| let headersDir = archivePath.appendingPathComponent("Headers").resolvingSymlinksInPath() | ||
|
|
||
| // The macOS Headers directory can have a Headers file in it symbolically linked to nowhere. |
There was a problem hiding this comment.
Fixing a zip distribution bug caught by the Carthage hash generation
| { | ||
| } |
There was a problem hiding this comment.
Hmm we currently don't build this in the zip, do we? I thought we had excluded it
There was a problem hiding this comment.
Doesn't look like it. It's part of 8.0.0. Perhaps we only excluded for Carthage before but now that Carthage matches zip, we shouldn't?
There was a problem hiding this comment.
Discussed offline, SGTM on including it.
| } | ||
| return xcframework | ||
| } | ||
|
|
There was a problem hiding this comment.
Yessssssss so happy all this code is going away 🥳
| carthageToInstall[podName] = [carthageFramework] | ||
| } | ||
|
|
||
| if podName == "FirebaseCoreDiagnostics" { |
There was a problem hiding this comment.
Do we want to also gate this on includeCarthage? Otherwise we'll be compiling CD when we don't need to. Same in the below few blocks
There was a problem hiding this comment.
Any reason, we shouldn't always build Carthage when we're building a Firebase distro. How about removing the includeCarthage flag in a subsequent PR?
There was a problem hiding this comment.
SGTM to move in a subsequent PR and merging as is.
| } | ||
| frameworks.append(zipLocation) | ||
|
|
||
| CarthageUtils.generatePlistContents( |
There was a problem hiding this comment.
Is this not relevant anymore?
There was a problem hiding this comment.
It's done in the xcframework build. Ideally generatePlistContents should be moved out of CarthageUtils. I can do that in a subsequent PR.
|
Thanks for getting this updated so quickly! |
Restore Carthage distribution now that Carthage 0.38.0 supports binary xcframework distributions.
This PR removes the code that was repackaging build xcframeworks as frameworks for Carthage. Now we distribute exactly the same xcframeworks in the zip distribution as Carthage with the exception of the rebuilt FirebaseCoreDiagnostics.
Successful Carthage 8.0.0 generation in https://github.com/firebase/firebase-ios-sdk/actions/runs/845683211 after generating package on GHA after disabling
--local-podspec-pathfrombuild_zip.sh. More context about this in #8082.