Remove Interop refs from ZipBuilder (#5779)

Author: paulb777

ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -432,16 +432,14 @@ enum CocoaPodUtils {
     }
 
     // If we're using local pods, explicitly add FirebaseInstanceID, FirebaseInstallations,
-    // the Interop pods, and any Google* podspecs if they exist and there are no
-    // explicit versions in the Podfile. Note there are versions for local podspecs if we're doing
-    // the secondary install for module map building.
+    // and any Google* podspecs if they exist and there are no explicit versions in the Podfile.
+    // Note there are versions for local podspecs if we're doing the secondary install for module
+    // map building.
     if !versionsSpecified, let localURL = LaunchArgs.shared.localPodspecPath {
       let podspecs = try! FileManager.default.contentsOfDirectory(atPath: localURL.path)
       for podspec in podspecs {
         if (podspec == "FirebaseInstanceID.podspec" ||
           podspec == "FirebaseInstallations.podspec" ||
-          podspec == "FirebaseAnalyticsInterop.podspec" ||
-          podspec == "FirebaseAuthInterop.podspec" ||
           podspec == "FirebaseCoreDiagnostics.podspec") ||
           podspec.starts(with: "Google"), podspec.hasSuffix(".podspec") {
           let podName = podspec.replacingOccurrences(of: ".podspec", with: "")

ZipBuilder/Sources/ZipBuilder/ZipBuilder.swift

@@ -385,9 +385,8 @@ struct ZipBuilder {
     // Loop through each installedPod item and get the name so we can fetch the framework and copy
     // it to the destination directory.
     for podName in installedPods {
-      // Skip the Firebase pod, any Interop pods, and specifically ignored frameworks.
+      // Skip the Firebase pod and specifically ignored frameworks.
       guard podName != "Firebase",
-        !podName.contains("Interop"),
         !podsToIgnore.contains(podName) else {
         continue
       }
@@ -557,9 +556,8 @@ struct ZipBuilder {
                                                .duplicateFrameworksToRemove(pod: podName))
 
     let copiedFrameworks = namedFrameworks.filter {
-      // Only return the frameworks that aren't contained in the "podsToIgnore" array, aren't an
-      // interop framework (since they don't compile to frameworks), or the Firebase pod itself.
-      !(podsToIgnore.contains($0) || $0.hasSuffix("Interop") || $0 == "Firebase")
+      // Skip frameworks that aren't contained in the "podsToIgnore" array and the Firebase pod.
+      !(podsToIgnore.contains($0) || $0 == "Firebase")
     }
 
     return (productDir, copiedFrameworks)
@@ -688,9 +686,8 @@ struct ZipBuilder {
     for (podName, podInfo) in pods {
       var frameworks: [URL] = []
       var carthageFrameworks: [URL] = []
-      // Ignore any Interop pods or the Firebase umbrella pod.
-      guard !podName.contains("Interop"),
-        podName != "Firebase" else {
+      // Ignore the Firebase umbrella pod.
+      guard podName != "Firebase" else {
         continue
       }