@@ -460,7 +460,7 @@ struct ZipBuilder {
460
460
withInstalledPods: installedPods,
461
461
rootZipDir: zipDir,
462
462
builtFrameworks: frameworksToAssemble,
463
- podsToIgnore : analyticsPods)
463
+ frameworksToIgnore : analyticsPods)
464
464
// Update the README.
465
465
readmeDeps += dependencyString ( for: folder, in: productDir, frameworks: podFrameworks)
466
466
} catch {
@@ -572,7 +572,7 @@ struct ZipBuilder {
572
572
func copyFrameworks( fromPods installedPods: [ String ] ,
573
573
toDirectory dir: URL ,
574
574
frameworkLocations: [ String : [ URL ] ] ,
575
- podsToIgnore : [ String ] = [ ] ) throws -> [ String ] {
575
+ frameworksToIgnore : [ String ] = [ ] ) throws -> [ String ] {
576
576
let fileManager = FileManager . default
577
577
if !fileManager. directoryExists ( at: dir) {
578
578
try fileManager. createDirectory ( at: dir, withIntermediateDirectories: false , attributes: nil )
@@ -585,8 +585,7 @@ struct ZipBuilder {
585
585
// it to the destination directory.
586
586
for podName in installedPods {
587
587
// Skip the Firebase pod and specifically ignored frameworks.
588
- guard podName != " Firebase " ,
589
- !podsToIgnore. contains ( podName) else {
588
+ guard podName != " Firebase " else {
590
589
continue
591
590
}
592
591
@@ -602,6 +601,10 @@ struct ZipBuilder {
602
601
// Copy each of the frameworks over, unless it's explicitly ignored.
603
602
for xcframework in xcframeworks {
604
603
let xcframeworkName = xcframework. lastPathComponent
604
+ let name = ( xcframeworkName as NSString ) . deletingPathExtension
605
+ if frameworksToIgnore. contains ( name) {
606
+ continue
607
+ }
605
608
let destination = dir. appendingPathComponent ( xcframeworkName)
606
609
try fileManager. copyItem ( at: xcframework, to: destination)
607
610
copiedFrameworkNames
@@ -713,8 +716,8 @@ struct ZipBuilder {
713
716
withInstalledPods installedPods: [ String : CocoaPodUtils . PodInfo ] ,
714
717
rootZipDir: URL ,
715
718
builtFrameworks: [ String : [ URL ] ] ,
716
- podsToIgnore : [ String ] = [ ] ) throws -> ( productDir : URL ,
717
- frameworks: [ String ] ) {
719
+ frameworksToIgnore : [ String ] = [ ] ) throws
720
+ -> ( productDir : URL , frameworks: [ String ] ) {
718
721
let podsToCopy = [ podName] +
719
722
CocoaPodUtils. transitiveMasterPodDependencies ( for: podName, in: installedPods)
720
723
// Remove any duplicates from the `podsToCopy` array. The easiest way to do this is to wrap it
@@ -726,11 +729,11 @@ struct ZipBuilder {
726
729
let namedFrameworks = try copyFrameworks ( fromPods: dedupedPods,
727
730
toDirectory: productDir,
728
731
frameworkLocations: builtFrameworks,
729
- podsToIgnore : podsToIgnore )
732
+ frameworksToIgnore : frameworksToIgnore )
730
733
731
734
let copiedFrameworks = namedFrameworks. filter {
732
- // Skip frameworks that aren't contained in the "podsToIgnore " array and the Firebase pod.
733
- !( podsToIgnore . contains ( $0) || $0 == " Firebase " )
735
+ // Skip frameworks that aren't contained in the "frameworksToIgnore " array and the Firebase pod.
736
+ !( frameworksToIgnore . contains ( $0) || $0 == " Firebase " )
734
737
}
735
738
736
739
return ( productDir, copiedFrameworks)
0 commit comments