style.sh generated changes (#4140)

* style.sh generated changes

* Fix style.sh detection of swift formatting issues

Author: wilhuff

ZipBuilder/Sources/UpdateFirebasePod/FirebasePod.swift

@@ -20,7 +20,6 @@ import ManifestReader
 
 /// Updates the Firebase Pod with a release's version set.
 struct FirebasePod {
-
   /// Relevant paths in the filesystem to build the release directory.
   struct FilesystemPaths {
     // MARK: - Required Paths

ZipBuilder/Sources/UpdateFirebasePod/LaunchArgs.swift

@@ -68,7 +68,6 @@ struct LaunchArgs {
   ///                  `FileManager.default`.
   init(userDefaults defaults: UserDefaults = UserDefaults.standard,
        fileChecker: FileChecker = FileManager.default) {
-
     // Parse the current releases key.
     guard let currentRelease = defaults.string(forKey: Key.releasingPods.rawValue) else {
       LaunchArgs.exitWithUsageAndLog("Missing required key: `\(Key.releasingPods)` for the file " +

ZipBuilder/Sources/UpdateFirebasePod/main.swift

@@ -72,8 +72,8 @@ private func updateFirebasePod(newVersions: [String: String]) {
       while contents[versionEndIndex] != "'" {
         versionEndIndex = contents.index(versionEndIndex, offsetBy: 1)
       }
-      contents.removeSubrange(versionStartIndex...versionEndIndex)
-      contents.insert(contentsOf:"'" + version + "'", at:versionStartIndex)
+      contents.removeSubrange(versionStartIndex ... versionEndIndex)
+      contents.insert(contentsOf: "'" + version + "'", at: versionStartIndex)
     } else {
       // Replace version in string like ss.dependency 'FirebaseCore', '6.3.0'
       guard let range = contents.range(of: pod) else {
@@ -88,14 +88,13 @@ private func updateFirebasePod(newVersions: [String: String]) {
       while contents[versionEndIndex] != "'" {
         versionEndIndex = contents.index(versionEndIndex, offsetBy: 1)
       }
-      contents.removeSubrange(versionStartIndex...versionEndIndex)
-      contents.insert(contentsOf:version + "'", at:versionStartIndex)
+      contents.removeSubrange(versionStartIndex ... versionEndIndex)
+      contents.insert(contentsOf: version + "'", at: versionStartIndex)
     }
   }
   do {
     try contents.write(toFile: podspecFile, atomically: false, encoding: String.Encoding.utf8)
-  }
-  catch {
+  } catch {
     fatalError("Failed to write \(podspecFile). \(error)")
   }
 }
@@ -106,11 +105,10 @@ do {
   print("Updating Firebase pod for version \(String(describing: newVersions["Firebase"]!))")
 
   // Get the time since the tool start.
-    let secondsSinceStart = -Int(buildStart.timeIntervalSinceNow)
+  let secondsSinceStart = -Int(buildStart.timeIntervalSinceNow)
   print("""
   Time profile:
     It took \(secondsSinceStart) seconds (~\(secondsSinceStart / 60)m) to update the Firebase pod.
     \(cocoaPodsUpdateMessage)
   """)
 }
-

scripts/style.sh

@@ -173,7 +173,10 @@ needs_formatting=false
 for f in $files; do
   if [[ "${f: -6}" == '.swift' ]]; then
     if [[ "$system" == 'Darwin' ]]; then
-      swiftformat "${swift_options[@]}" "$f" 2> /dev/null | grep 'would have updated' > /dev/null
+      # Match output that says:
+      # 1/1 files would have been formatted.  (with --dryrun)
+      # 1/1 files formatted.                  (without --dryrun)
+      swiftformat "${swift_options[@]}" "$f" 2>&1 | grep '^1/1 files' > /dev/null
     else
       false
     fi