ZipBuilder: Remove unnecessary public's (#4456)

Author: paulb777

ZipBuilder/Sources/ZipBuilder/CarthageUtils.swift

@@ -19,9 +19,9 @@ import Foundation
 
 /// Carthage related utility functions. The enum type is used as a namespace here instead of having
 /// root functions, and no cases should be added to it.
-public enum CarthageUtils {}
+enum CarthageUtils {}
 
-public extension CarthageUtils {
+extension CarthageUtils {
   /// Generates all required files for a Carthage release.
   ///
   /// - Parameters:

ZipBuilder/Sources/ZipBuilder/CocoaPodUtils.swift

@@ -18,10 +18,10 @@ import Foundation
 
 /// CocoaPod related utility functions. The enum type is used as a namespace here instead of having
 /// root functions, and no cases should be added to it.
-public enum CocoaPodUtils {
+enum CocoaPodUtils {
   // MARK: - Public API
 
-  public struct VersionedPod: Decodable {
+  struct VersionedPod: Decodable {
     /// Public name of the pod.
     let name: String
 
@@ -30,7 +30,7 @@ public enum CocoaPodUtils {
   }
 
   /// Information associated with an installed pod.
-  public struct PodInfo {
+  struct PodInfo {
     /// The version of the generated pod.
     let version: String
 
@@ -42,7 +42,7 @@ public enum CocoaPodUtils {
   }
 
   /// Executes the `pod cache clean --all` command to remove any cached CocoaPods.
-  public static func cleanPodCache() {
+  static func cleanPodCache() {
     let result = Shell.executeCommandFromScript("pod cache clean --all", outputToConsole: false)
     switch result {
     case let .error(code):
@@ -56,7 +56,7 @@ public enum CocoaPodUtils {
   }
 
   /// Gets metadata from installed Pods. Reads the `Podfile.lock` file and parses it.
-  public static func installedPodsInfo(inProjectDir projectDir: URL) -> [String: PodInfo] {
+  static func installedPodsInfo(inProjectDir projectDir: URL) -> [String: PodInfo] {
     // Read from the Podfile.lock to get the installed versions and names.
     let podfileLock: String
     do {
@@ -78,9 +78,9 @@ public enum CocoaPodUtils {
   ///   - customSpecRepos: Additional spec repos to check for installation.
   /// - Returns: A dictionary of PodInfo's keyed by the pod name.
   @discardableResult
-  public static func installPods(_ pods: [VersionedPod],
-                                 inDir directory: URL,
-                                 customSpecRepos: [URL]? = nil) -> [String: PodInfo] {
+  static func installPods(_ pods: [VersionedPod],
+                          inDir directory: URL,
+                          customSpecRepos: [URL]? = nil) -> [String: PodInfo] {
     let fileManager = FileManager.default
     // Ensure the directory exists, otherwise we can't install all subspecs.
     guard fileManager.directoryExists(at: directory) else {
@@ -126,7 +126,7 @@ public enum CocoaPodUtils {
   ///
   /// - Parameter contents: The contents of a `Podfile.lock` file.
   /// - Returns: A dictionary of PodInfo structs keyed by the pod name.
-  public static func loadPodInfoFromPodfileLock(contents: String) -> [String: PodInfo] {
+  static func loadPodInfoFromPodfileLock(contents: String) -> [String: PodInfo] {
     // This pattern matches a pod name with its version (two to three components)
     // Examples:
     //  - FirebaseUI/Google (4.1.1):
@@ -187,7 +187,7 @@ public enum CocoaPodUtils {
     return installedPods
   }
 
-  public static func updateRepos() {
+  static func updateRepos() {
     let result = Shell.executeCommandFromScript("pod repo update")
     switch result {
     case let .error(_, output):
@@ -197,7 +197,7 @@ public enum CocoaPodUtils {
     }
   }
 
-  public static func podInstallPrepare(inProjectDir projectDir: URL) {
+  static func podInstallPrepare(inProjectDir projectDir: URL) {
     do {
       // Create the directory and all intermediate directories.
       try FileManager.default.createDirectory(at: projectDir, withIntermediateDirectories: true)

ZipBuilder/Sources/ZipBuilder/FileManager+Utils.swift

@@ -17,7 +17,7 @@
 import Foundation
 
 // Extensions to FileManager that make scripting easier or cleaner for error reporting.
-public extension FileManager {
+extension FileManager {
   // MARK: - Helper Enum Declarations
 
   /// Describes a type of file to be searched for.

ZipBuilder/Sources/ZipBuilder/FirebasePods.swift

@@ -18,7 +18,7 @@ import Foundation
 
 // TODO: Auto generate this list from the Firebase.podspec and others, probably with a script.
 /// All the CocoaPods related to packaging and distributing Firebase.
-public enum FirebasePods: String, CaseIterable {
+enum FirebasePods: String, CaseIterable {
   case abTesting = "FirebaseABTesting"
   case adMob = "Google-Mobile-Ads-SDK"
   case analytics = "FirebaseAnalytics"
@@ -50,7 +50,7 @@ public enum FirebasePods: String, CaseIterable {
   case storage = "FirebaseStorage"
 
   /// Flag to explicitly exclude any Resources from being copied.
-  public var excludeResources: Bool {
+  var excludeResources: Bool {
     switch self {
     case .mlVision, .mlVisionBarcodeModel, .mlVisionLabelModel:
       return true
@@ -60,7 +60,7 @@ public enum FirebasePods: String, CaseIterable {
   }
 
   /// Describes the dependency on other frameworks for the README file.
-  public static func readmeHeader(podName: String) -> String {
+  static func readmeHeader(podName: String) -> String {
     var header = "## \(podName)"
     if !(podName == "FirebaseAnalytics" || podName == "GoogleSignIn") {
       header += " (~> FirebaseAnalytics)"
@@ -74,7 +74,7 @@ public enum FirebasePods: String, CaseIterable {
   /// Returns folders to remove from the Zip file from a specific pod for de-duplication. This
   /// is necessary for the MLKit frameworks because of their unique structure, an unnecessary amount
   /// of frameworks get pulled in.
-  public static func duplicateFrameworksToRemove(pod: String) -> [String] {
+  static func duplicateFrameworksToRemove(pod: String) -> [String] {
     switch pod {
     case "FirebaseMLVisionBarcodeModel", "FirebaseMLVisionFaceModel", "FirebaseMLVisionLabelModel",
          "FirebaseMLVisionTextModel":

ZipBuilder/Sources/ZipBuilder/FrameworkBuilder.swift

@@ -17,7 +17,7 @@
 import Foundation
 
 /// Different architectures to build frameworks for.
-public enum Architecture: String, CaseIterable {
+enum Architecture: String, CaseIterable {
   /// The target platform that the framework is built for.
   enum TargetPlatform: String {
     case device = "iphoneos"
@@ -79,9 +79,9 @@ struct FrameworkBuilder {
   ///   - version: String representation of the version.
   /// - Parameter logsOutputDir: The path to the directory to place build logs.
   /// - Returns: A URL to the framework that was built (or pulled from the cache).
-  public func buildFramework(withName podName: String,
-                             version: String,
-                             logsOutputDir: URL? = nil) -> URL {
+  func buildFramework(withName podName: String,
+                      version: String,
+                      logsOutputDir: URL? = nil) -> URL {
     print("Building \(podName)")
 
     // Get (or create) the cache directory for storing built frameworks.

ZipBuilder/Sources/ZipBuilder/HashCalculator.swift

@@ -20,9 +20,9 @@ import Foundation
 /// Hashing related utility functions. The enum type is used as a namespace here instead of having
 /// root functions, and no cases should be added to it. Note: this would be named `Hasher` but it
 /// collide's with Foundation's `Hasher` type.
-public enum HashCalculator {}
+enum HashCalculator {}
 
-public extension HashCalculator {
+extension HashCalculator {
   enum HashError: Error {
     /// Real errors aren't thrown, so just give text what happened.
     case failed(String)

ZipBuilder/Sources/ZipBuilder/ModuleMapBuilder.swift

@@ -83,7 +83,7 @@ struct ModuleMapBuilder {
 
   /// Build the module map files for the source frameworks.
   ///
-  public func build() {
+  func build() {
     for (_, info) in installedPods {
       if info.isSourcePod == false || info.transitiveFrameworks != nil {
         continue

ZipBuilder/Sources/ZipBuilder/ResourcesManager.swift

@@ -26,7 +26,7 @@ extension ResourcesManager {
   /// - Parameter dir: The directory to search for any sign of resources.
   /// - Returns: True if any resources could be found, otherwise false.
   /// - Throws: A FileManager API that was thrown while searching.
-  public static func directoryContainsResources(_ dir: URL) throws -> Bool {
+  static func directoryContainsResources(_ dir: URL) throws -> Bool {
     // First search for any .bundle files.
     let fileManager = FileManager.default
     let bundles = try fileManager.recursivelySearch(for: .bundles, in: dir)
@@ -58,8 +58,8 @@ extension ResourcesManager {
   /// - Returns: True if any resources were moved and packaged, otherwise false.
   /// - Throws: Any file system errors that occur.
   @discardableResult
-  public static func packageAllResources(containedIn dir: URL,
-                                         bundlesToIgnore: [String] = []) throws -> Bool {
+  static func packageAllResources(containedIn dir: URL,
+                                  bundlesToIgnore: [String] = []) throws -> Bool {
     let resourcesFound = try directoryContainsResources(dir)
 
     // Quit early if there are no resources to deal with.
@@ -162,7 +162,7 @@ extension ResourcesManager {
   /// - Returns: An array of URLs pointing to the newly located bundles.
   /// - Throws: Any file system errors that occur.
   @discardableResult
-  public static func moveAllBundles(inDirectory dir: URL, to resourceDir: URL) throws -> [URL] {
+  static func moveAllBundles(inDirectory dir: URL, to resourceDir: URL) throws -> [URL] {
     let fileManager = FileManager.default
     let allBundles = try fileManager.recursivelySearch(for: .bundles, in: dir)
 
@@ -183,7 +183,7 @@ extension ResourcesManager {
   /// This is a recrusive search.
   ///
   /// - Parameter dir: The directory to recursively search for Resources directories in.
-  public static func removeEmptyResourcesDirectories(in dir: URL) {
+  static func removeEmptyResourcesDirectories(in dir: URL) {
     // Find all the Resources directories to begin with.
     let fileManager = FileManager.default
     guard let resourceDirs = try? fileManager.recursivelySearch(for: .directories(name: "Resources"), in: dir) else {

ZipBuilder/Sources/ZipBuilder/URL+Utils.swift

@@ -17,7 +17,7 @@
 import Foundation
 
 /// Utilities to simplify URL manipulation.
-public extension URL {
+extension URL {
   /// Appends each item in the array as a component to the existing URL.
   func appendingPathComponents(_ components: [String]) -> URL {
     // Append multiple path components in a single call to prevent long lines of multiple calls.

ZipBuilder/Sources/ZipBuilder/ZipBuilder.swift

@@ -19,25 +19,25 @@ import Foundation
 import ManifestReader
 
 /// Misc. constants used in the build tool.
-public struct Constants {
+struct Constants {
   /// Constants related to the Xcode project template.
-  public struct ProjectPath {
+  struct ProjectPath {
     // Required for building.
-    public static let infoPlist = "Info.plist"
-    public static let projectFile = "FrameworkMaker.xcodeproj"
+    static let infoPlist = "Info.plist"
+    static let projectFile = "FrameworkMaker.xcodeproj"
 
     /// All required files for building the Zip file.
-    public static let requiredFilesForBuilding: [String] = [projectFile, infoPlist]
+    static let requiredFilesForBuilding: [String] = [projectFile, infoPlist]
 
     // Required for distribution.
-    public static let readmeName = "README.md"
+    static let readmeName = "README.md"
 
     // Required from the Firebase pod.
-    public static let firebaseHeader = "Firebase.h"
-    public static let modulemap = "module.modulemap"
+    static let firebaseHeader = "Firebase.h"
+    static let modulemap = "module.modulemap"
 
     /// The dummy Firebase library for Carthage distribution.
-    public static let dummyFirebaseLib = "dummy_Firebase_lib"
+    static let dummyFirebaseLib = "dummy_Firebase_lib"
 
     // Make the struct un-initializable.
     @available(*, unavailable)
@@ -46,14 +46,14 @@ public struct Constants {
 
   /// The text added to the README for a product if it contains Resources. The empty line at the end
   /// is intentional.
-  public static let resourcesRequiredText = """
+  static let resourcesRequiredText = """
   You'll also need to add the resources in the Resources
   directory into your target's main bundle.
 
   """
 
   /// The name of the Core Diagnostics pod.
-  public static let coreDiagnosticsName: String = "FirebaseCoreDiagnostics"
+  static let coreDiagnosticsName: String = "FirebaseCoreDiagnostics"
 
   // Make the struct un-initializable.
   @available(*, unavailable)