Fix metadata.md generation (#12423)

Author: paulb777

ReleaseTooling/Sources/Utils/FileManager+Utils.swift

@@ -28,9 +28,6 @@ public extension FileManager {
     /// All folders with a `.bundle` extension.
     case bundles
 
-    /// All folders with a `.bundle` extension excluding privacy manifest bundles.
-    case nonPrivacyBundles
-
     /// A directory with an optional name. If name is `nil`, all directories will be matched.
     case directories(name: String?)
 
@@ -162,7 +159,13 @@ public extension FileManager {
     // Recursively search using the enumerator, adding any matches to the array.
     var matches: [URL] = []
     var foundXcframework = false // Ignore .frameworks after finding an xcframework.
-    while let fileURL = dirEnumerator.nextObject() as? URL {
+    for case let fileURL as URL in dirEnumerator {
+      // Never mess with Privacy.bundles
+      if fileURL.lastPathComponent.hasSuffix("_Privacy.bundle") {
+        dirEnumerator.skipDescendants()
+        continue
+      }
+
       switch type {
       case .allFiles:
         // Skip directories, include everything else.
@@ -189,13 +192,6 @@ public extension FileManager {
         if fileURL.pathExtension == "bundle" {
           matches.append(fileURL)
         }
-      case .nonPrivacyBundles:
-        // The only thing of interest is the path extension being ".bundle", but not a privacy
-        // bundle.
-        if fileURL.pathExtension == "bundle",
-           !fileURL.lastPathComponent.hasSuffix("_Privacy.bundle") {
-          matches.append(fileURL)
-        }
       case .headers:
         if fileURL.pathExtension == "h" {
           matches.append(fileURL)

ReleaseTooling/Sources/ZipBuilder/ResourcesManager.swift

@@ -30,7 +30,7 @@ extension ResourcesManager {
   static func directoryContainsResources(_ dir: URL) throws -> Bool {
     // First search for any .bundle files.
     let fileManager = FileManager.default
-    let bundles = try fileManager.recursivelySearch(for: .nonPrivacyBundles, in: dir)
+    let bundles = try fileManager.recursivelySearch(for: .bundles, in: dir)
 
     // Stop searching if there were any bundles found.
     if !bundles.isEmpty { return true }
@@ -168,7 +168,7 @@ extension ResourcesManager {
                              to resourceDir: URL,
                              keepOriginal: Bool = false) throws -> [URL] {
     let fileManager = FileManager.default
-    let allBundles = try fileManager.recursivelySearch(for: .nonPrivacyBundles, in: dir)
+    let allBundles = try fileManager.recursivelySearch(for: .bundles, in: dir)
 
     // If no bundles are found, return an empty array since nothing was done (but there wasn't an
     // error).

ReleaseTooling/Sources/ZipBuilder/ZipBuilder.swift

@@ -243,7 +243,11 @@ struct ZipBuilder {
                                                                          podInfo: podInfo)
             carthageGoogleUtilitiesFrameworks += cdFrameworks
           }
-          if resourceContents != nil {
+          let fileManager = FileManager.default
+          if let resourceContents,
+             let contents = try? fileManager.contentsOfDirectory(at: resourceContents,
+                                                                 includingPropertiesForKeys: nil),
+             !contents.isEmpty {
             resources[podName] = resourceContents
           }
         } else if podsBuilt[podName] == nil {