From f21d99a895de776336e478f7c20b81a66ca25e86 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 14 Nov 2023 11:22:58 -0800
Subject: [PATCH] Revert "[Release Tooling] Stage and publish with
 `--skip-import-validation` (#12039)"

This reverts commit 3fb21b0cca3fdb62e6215871dcbfae7d281e23e0.
---
 ReleaseTooling/Sources/FirebaseManifest/Pod.swift  | 10 ++++++++++
 ReleaseTooling/Sources/FirebaseReleaser/Push.swift |  5 +++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ReleaseTooling/Sources/FirebaseManifest/Pod.swift b/ReleaseTooling/Sources/FirebaseManifest/Pod.swift
index cd5b572c7f4..47d2d26ee6c 100755
--- a/ReleaseTooling/Sources/FirebaseManifest/Pod.swift
+++ b/ReleaseTooling/Sources/FirebaseManifest/Pod.swift
@@ -54,4 +54,14 @@ public struct Pod {
   public func podspecName() -> String {
     return "\(name).podspec"
   }
+
+  /// The Firebase pod does not support import validation with Xcode 12 because of the deprecated
+  /// ML pods not supporting the ARM Mac slice.
+  public func skipImportValidation() -> String {
+    if name == "Firebase" {
+      return "--skip-import-validation"
+    } else {
+      return ""
+    }
+  }
 }
diff --git a/ReleaseTooling/Sources/FirebaseReleaser/Push.swift b/ReleaseTooling/Sources/FirebaseReleaser/Push.swift
index de8dbbb5215..3fd67f87da5 100644
--- a/ReleaseTooling/Sources/FirebaseReleaser/Push.swift
+++ b/ReleaseTooling/Sources/FirebaseReleaser/Push.swift
@@ -48,11 +48,12 @@ enum Push {
         switch destination {
         case .staging:
           return "pod repo push --skip-tests --use-json \(warningsOK) \(stagingLocation) " +
-            "--skip-import-validation" + " \(pod.podspecName()) " +
+            pod.skipImportValidation() + " \(pod.podspecName()) " +
             "--sources=\(stagingRepo).git,https://cdn.cocoapods.org"
         case .trunk:
           return "pod trunk push --skip-tests --synchronous \(warningsOK) " +
-            "--skip-import-validation" + " ~/.cocoapods/repos/\(stagingLocation)/\(pod.name)/" +
+            pod
+            .skipImportValidation() + " ~/.cocoapods/repos/\(stagingLocation)/\(pod.name)/" +
             "\(manifest.versionString(pod))/\(pod.name).podspec.json"
         }
       }()