Fix CI issues from changing interop pod version requirements (#4979)

Author: paulb777

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_frameworks/Podfile

@@ -8,7 +8,9 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCoreDiagnostics', :path => '../'
   pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
+  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
+  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_6_1_staticLibs/Podfile

@@ -6,7 +6,9 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCoreDiagnostics', :path => '../'
   pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
+  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
+  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_frameworks/Podfile

@@ -8,7 +8,9 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCoreDiagnostics', :path => '../'
   pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
+  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
+  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_frameworks/Podfile

@@ -9,7 +9,9 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCoreDiagnostics', :path => '../'
   pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
+  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
+  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_multiprojects_staticLibs/Podfile

@@ -6,7 +6,9 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCoreDiagnostics', :path => '../'
   pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
+  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
+  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

CocoapodsIntegrationTest/TestEnvironments/Cocoapods1_7_0_staticLibs/Podfile

@@ -6,7 +6,9 @@ target 'CocoapodsIntegrationTest' do
   pod 'FirebaseCoreDiagnostics', :path => '../'
   pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
   pod 'FirebaseCrashlytics', :path => '../'
+  pod 'FirebaseAnalyticsInterop', :path => '../'
   pod 'FirebaseAuth', :path => '../'
+  pod 'FirebaseAuthInterop', :path => '../'
   pod 'FirebaseDatabase', :path => '../'
   pod 'FirebaseDynamicLinks', :path => '../'
   pod 'FirebaseFirestore', :path => '../'

SymbolCollisionTest/Podfile

@@ -10,8 +10,12 @@ target 'SymbolCollisionTest' do
   # Firebase Pods
     pod 'Firebase', :path => '../'
     pod 'FirebaseAnalytics'
+    pod 'FirebaseAnalyticsInterop', :path => '../'
     pod 'FirebaseAuth', :path => '../'
+    pod 'FirebaseAuthInterop', :path => '../'
     pod 'FirebaseCore', :path => '../'
+    pod 'FirebaseCoreDiagnostics', :path => '../'
+    pod 'FirebaseCoreDiagnosticsInterop', :path => '../'
     pod 'FirebaseCrashlytics', :path => '../'
     pod 'FirebaseDatabase', :path => '../'
     pod 'FirebaseDynamicLinks', :path => '../'

ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -341,14 +341,17 @@ enum CocoaPodUtils {
     }
 
     // If we're using local pods, explicitly add FirebaseInstanceID, FirebaseInstallations,
-    // and any Google* podspecs if they exist and there are no
+    // 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.
     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 == "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: "")
           podfile += "  pod '\(podName)', :path => '\(localURL.path)/\(podspec)'\n"

scripts/localize_podfile.swift

@@ -26,7 +26,8 @@ let podfile = CommandLine.arguments[1]
 // versions when they're dependencies of other requested local pods.
 let implicitPods = ["FirebaseCore", "FirebaseInstanceID", "FirebaseInstallations", "Firebase",
                     "GoogleDataTransport", "GoogleDataTransportCCTSupport", "GoogleUtilities",
-                    "FirebaseCoreDiagnostics", "FirebaseRemoteConfig", "FirebaseAuthInterop"]
+                    "FirebaseAnalyticsInterop", "FirebaseAuthInterop", "FirebaseCoreDiagnostics",
+                    "FirebaseCoreDiagnosticsInterop", "FirebaseRemoteConfig", "FirebaseAuthInterop"]
 var didImplicits = false
 
 var fileContents = ""