Fix build_non_firebase_sdks.sh for 7.x Swift pods (#7396)

Author: paulb777

.github/workflows/release.yml

@@ -18,7 +18,7 @@ jobs:
     env:
       bot_token_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
       local_repo: specstesting
-      nightly_version: "6.32.1"
+      nightly_version: "7.5.0"
       local_sdk_repo_dir: /tmp/test/firebase-ios-sdk
       podspec_repo_branch: master
     runs-on: macOS-latest

.github/workflows/zip.yml

@@ -5,6 +5,7 @@ on:
     paths:
     - 'ReleaseTooling/**'
     - '.github/workflows/zip.yml'
+    - 'scripts/build_non_firebase_sdks.sh'
     - 'Gemfile'
     # Don't run based on any markdown only changes.
     - '!ReleaseTooling/*.md'

scripts/build_non_firebase_sdks.sh

@@ -27,7 +27,13 @@ num_sdk="${#NON_FIREBASE_SDKS[@]}"
 echo "[" >> "${ZIP_POD_JSON}"
 for sdk in "${NON_FIREBASE_SDKS[@]}"
 do
-  echo "{\"name\":\"${sdk}\"}" >>  "${ZIP_POD_JSON}"
+  if [ ${sdk} == "FirebaseFirestoreSwift" ]; then
+    echo "{\"name\":\"FirebaseFirestoreSwift\", \"version\" : \"~> 7.5-beta\"}" >>  "${ZIP_POD_JSON}"
+  elif [ ${sdk} == "FirebaseStorageSwift" ]; then
+    echo "{\"name\":\"FirebaseStorageSwift\", \"version\" : \"~> 7.5-beta\"}" >>  "${ZIP_POD_JSON}"
+  else
+    echo "{\"name\":\"${sdk}\"}" >>  "${ZIP_POD_JSON}"
+  fi
   if [ "$num_sdk" -ne 1 ]; then
     echo ",">>  "${ZIP_POD_JSON}"
   fi
@@ -42,5 +48,3 @@ unzip -o "${REPO}"/sdk_zip/Frameworks.zip -d "${HOME}"/ios_frameworks/Firebase/
 
 # Move Frameworks to Firebase dir, so be align with Firebase SDKs.
 mv -n "${HOME}"/ios_frameworks/Firebase/Binaries "${HOME}"/ios_frameworks/Firebase/NonFirebaseSDKs/
-
-

scripts/create_spec_repo/Sources/SpecRepoBuilder/main.swift

@@ -244,6 +244,8 @@ struct SpecRepoBuilder: ParsableCommand {
         )
     shell.run("pod repo update")
 
+    print("Outcome is \(outcome)")
+
     return outcome
   }
 
@@ -344,6 +346,7 @@ struct SpecRepoBuilder: ParsableCommand {
       if podExitCode != 0 {
         exitCode = 1
         failedPods.append(pod)
+        print("Failed pod - \(pod)")
       }
     }
     if exitCode != 0 {