ZipBuilder workaround (#7286)

paulb777 · web-flow · commit 3721a5b8a623 · 2021-01-12T07:20:43.000-08:00
diff --git a/ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift b/ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift
@@ -244,7 +244,12 @@ struct ZipBuilder {
           }
         }
         // Union all pods built across platforms.
-        podsBuilt[podName] = podInfo
+        // Be conservative and favor iOS if it exists - and workaround
+        // bug where Firebase.h doesn't get installed for tvOS and macOS.
+        // Fixed in #7284.
+        if podsBuilt[podName] == nil {
+          podsBuilt[podName] = podInfo
+        }
       }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,12 @@ struct ZipBuilder {`
`244`	`244`	`}`
`245`	`245`	`}`
`246`	`246`	`// Union all pods built across platforms.`
`247`		`- podsBuilt[podName] = podInfo`
	`247`	`+ // Be conservative and favor iOS if it exists - and workaround`
	`248`	`+ // bug where Firebase.h doesn't get installed for tvOS and macOS.`
	`249`	`+ // Fixed in #7284.`
	`250`	`+ if podsBuilt[podName] == nil {`
	`251`	`+ podsBuilt[podName] = podInfo`
	`252`	`+ }`
`248`	`253`	`}`
`249`	`254`	`}`
`250`	`255`