[Infra] Refactors small areas of the ZipBuilder (#9920)

Author: ncooke3

ReleaseTooling/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -73,12 +73,11 @@ enum CocoaPodUtils {
 
     /// The debug description as required by `CustomDebugStringConvertible`.
     var debugDescription: String {
-      var desc = name
       if let version = version {
-        desc.append(" v\(version)")
+        return "\(name) v\(version)"
+      } else {
+        return name
       }
-
-      return desc
     }
   }
 

ReleaseTooling/Sources/ZipBuilder/ModuleMapBuilder.swift

@@ -111,13 +111,11 @@ struct ModuleMapBuilder {
   /// Build the module map files for the source frameworks.
   ///
   func build() {
-    for (_, info) in installedPods {
-      if info.isSourcePod == false ||
-        info.transitiveFrameworks != nil ||
-        info.versionedPod.name == "Firebase" {
-        continue
-      }
-      generate(framework: info)
+    for framework in installedPods.values
+      where framework.isSourcePod &&
+      framework.versionedPod.name != "Firebase" &&
+      framework.transitiveFrameworks == nil {
+      generate(framework: framework)
     }
   }
 
@@ -129,12 +127,14 @@ struct ModuleMapBuilder {
   private func generate(framework: FrameworkInfo) {
     let podName = framework.versionedPod.name
     let deps = CocoaPodUtils.transitiveVersionedPodDependencies(for: podName, in: allPods)
-    _ = CocoaPodUtils.installPods(allSubspecList(framework: framework) + deps,
-                                  inDir: projectDir,
-                                  platform: platform,
-                                  customSpecRepos: customSpecRepos,
-                                  localPodspecPath: localPodspecPath,
-                                  linkage: .forcedStatic)
+
+    CocoaPodUtils.installPods(allSubspecList(framework: framework) + deps,
+                              inDir: projectDir,
+                              platform: platform,
+                              customSpecRepos: customSpecRepos,
+                              localPodspecPath: localPodspecPath,
+                              linkage: .forcedStatic)
+
     let xcconfigFile = projectDir.appendingPathComponents(["Pods", "Target Support Files",
                                                            "Pods-FrameworkMaker",
                                                            "Pods-FrameworkMaker.release.xcconfig"])
@@ -146,15 +146,14 @@ struct ModuleMapBuilder {
   private func allSubspecList(framework: FrameworkInfo) -> [CocoaPodUtils.VersionedPod] {
     let name = framework.versionedPod.name
     let version = framework.versionedPod.version
-    let subspecs = framework.subspecs
-    if subspecs.count == 0 {
-      return [CocoaPodUtils.VersionedPod(name: "\(name)", version: version)]
+
+    guard framework.subspecs.count > 0 else {
+      return [CocoaPodUtils.VersionedPod(name: name, version: version)]
     }
-    var list: [CocoaPodUtils.VersionedPod] = []
-    for subspec in framework.subspecs {
-      list.append(CocoaPodUtils.VersionedPod(name: "\(name)/\(subspec)", version: version))
+
+    return framework.subspecs.map { subspec in
+      CocoaPodUtils.VersionedPod(name: "\(name)/\(subspec)", version: version)
     }
-    return list
   }
 
   // Extract the framework and library dependencies for a framework from