Skip to content

Commit 3fb21b0

Browse files
authored
[Release Tooling] Stage and publish with --skip-import-validation (#12039)
1 parent 6673e7c commit 3fb21b0

File tree

2 files changed

+2
-13
lines changed

2 files changed

+2
-13
lines changed

ReleaseTooling/Sources/FirebaseManifest/Pod.swift

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,4 @@ public struct Pod {
5454
public func podspecName() -> String {
5555
return "\(name).podspec"
5656
}
57-
58-
/// The Firebase pod does not support import validation with Xcode 12 because of the deprecated
59-
/// ML pods not supporting the ARM Mac slice.
60-
public func skipImportValidation() -> String {
61-
if name == "Firebase" {
62-
return "--skip-import-validation"
63-
} else {
64-
return ""
65-
}
66-
}
6757
}

ReleaseTooling/Sources/FirebaseReleaser/Push.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@ enum Push {
4848
switch destination {
4949
case .staging:
5050
return "pod repo push --skip-tests --use-json \(warningsOK) \(stagingLocation) " +
51-
pod.skipImportValidation() + " \(pod.podspecName()) " +
51+
"--skip-import-validation" + " \(pod.podspecName()) " +
5252
"--sources=\(stagingRepo).git,https://cdn.cocoapods.org"
5353
case .trunk:
5454
return "pod trunk push --skip-tests --synchronous \(warningsOK) " +
55-
pod
56-
.skipImportValidation() + " ~/.cocoapods/repos/\(stagingLocation)/\(pod.name)/" +
55+
"--skip-import-validation" + " ~/.cocoapods/repos/\(stagingLocation)/\(pod.name)/" +
5756
"\(manifest.versionString(pod))/\(pod.name).podspec.json"
5857
}
5958
}()

0 commit comments

Comments
 (0)