extend existing script

Author: ncooke3

scripts/.vscode/launch.json

@@ -0,0 +1,22 @@
+{
+    "configurations": [
+        {
+            "type": "swift",
+            "request": "launch",
+            "args": [],
+            "cwd": "${workspaceFolder:scripts}",
+            "name": "Debug SPMLocalize",
+            "program": "${workspaceFolder:scripts}/.build/debug/SPMLocalize",
+            "preLaunchTask": "swift: Build Debug SPMLocalize"
+        },
+        {
+            "type": "swift",
+            "request": "launch",
+            "args": [],
+            "cwd": "${workspaceFolder:scripts}",
+            "name": "Release SPMLocalize",
+            "program": "${workspaceFolder:scripts}/.build/release/SPMLocalize",
+            "preLaunchTask": "swift: Build Release SPMLocalize"
+        }
+    ]
+}

scripts/quickstart_spm_xcodeproj.sh

@@ -14,46 +14,94 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# Modify a .xcodeproj to use a specific branch, version, or commit for the
+# firebase-ios-sdk SPM dependency.
 
-# Modify a .xcodeproj to use a specific branch.
-
-set -xeuo pipefail
-
-SAMPLE=$1
-SAMPLE_DIR=$(echo "$SAMPLE" | perl -ne 'print lc')
-XCODEPROJ=${SAMPLE_DIR}/${SAMPLE}Example.xcodeproj/project.pbxproj
-
-# Regex matches SemVer `firebase-ios-sdk` dependency in project.pbxproj:
-# {
-#   isa = XCRemoteSwiftPackageReference;
-#	  repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git";
-#   requirement = {
-#     kind = upToNextMajorVersion;
-#	    minimumVersion = xx.yy.zz;
-#	  };
-# };
-REQUIREMENT_REGEX='({'\
-'\s*isa = XCRemoteSwiftPackageReference;'\
-'\s*repositoryURL = "https://github\.com/firebase/firebase-ios-sdk\.git";'\
-'\s*requirement = {\s*)kind = upToNextMajorVersion;'\
-'\s*minimumVersion = \d+\.\d+\.\d+;'\
-'(\s*};'\
-'\s*};)'
-
-# Replaces the minimumVersion requirement with a branch requirement.
-REPLACEMENT_REGEX="\1branch = $BRANCH_NAME;\n\t\t\t\tkind = branch;\2"
-
-# Performs the replacement using Perl.
-#
-# -0777 Enables reading all input in one go (slurp), rather than line-by-line.
-# -p Causes Perl to loop through the input line by line.
-# -i Edits the file in place.
-# -e Provides the expression to execute.
-perl -0777 -i -pe "s#$REQUIREMENT_REGEX#$REPLACEMENT_REGEX#g" "$XCODEPROJ" || {
-  echo "Failed to update quickstart's Xcode project to the branch: $BRANCH_NAME"
+set -euo pipefail
+
+# --- Helper functions ---
+usage() {
+  echo "Usage: $0 <path_to.xcodeproj> [--version <version> | --revision <revision> | --prerelease]"
+  echo "Example: $0 path/to/MyProject.xcodeproj --version 10.24.0"
+  exit 1
+}
+
+# --- Argument parsing ---
+if [[ $# -lt 2 ]]; then
+  usage
+fi
+
+XCODEPROJ_PATH="$1"
+shift
+MODE="$1"
+shift
+
+# Validate Xcode project path
+if [[ ! -d "$XCODEPROJ_PATH" || ! "$XCODEPROJ_PATH" == *.xcodeproj ]]; then
+    echo "Error: Invalid Xcode project path provided: $XCODEPROJ_PATH"
+    exit 1
+fi
+PBXPROJ_PATH="${XCODEPROJ_PATH}/project.pbxproj"
+if [[ ! -f "$PBXPROJ_PATH" ]]; then
+    echo "Error: project.pbxproj not found at ${PBXPROJ_PATH}"
+    exit 1
+fi
+
+case "$MODE" in
+  --version)
+    if [[ $# -lt 1 ]]; then usage; fi
+    VERSION="$1"
+    # Release testing: Point to CocoaPods-{VERSION} tag (as a branch)
+    export REPLACEMENT_VALUE
+    REPLACEMENT_VALUE=$(printf '{\n\t\t\t\tkind = branch;\n\t\t\t\tbranch = "%s";\n\t\t\t}' "$VERSION")
+    ;;
+  --prerelease)
+    # Prerelease testing: Point to the tip of the main branch
+    COMMIT_HASH=$(git ls-remote https://github.com/firebase/firebase-ios-sdk.git main | cut -f1)
+    if [[ -z "$COMMIT_HASH" ]]; then
+        echo "Error: Failed to get remote revision for main branch."
+        exit 1
+    fi
+    export REPLACEMENT_VALUE
+    REPLACEMENT_VALUE=$(printf '{\n\t\t\t\tkind = revision;\n\t\t\t\trevision = "%s";\n\t\t\t}' "$COMMIT_HASH")
+    ;;
+  --revision)
+    if [[ $# -lt 1 ]]; then usage; fi
+    REVISION="$1"
+    # PR testing: Point to the specific commit hash of the current branch
+    export REPLACEMENT_VALUE
+    REPLACEMENT_VALUE=$(printf '{\n\t\t\t\tkind = revision;\n\t\t\t\trevision = "%s";\n\t\t\t}' "$REVISION")
+    ;;
+  *)
+    usage
+    ;;
+esac
+
+# Read the original content to check for changes later.
+ORIGINAL_CONTENT=$(<"$PBXPROJ_PATH")
+
+# Use perl to perform the replacement.
+# -0777: Slurp the whole file into one string.
+# -i: Edit in-place.
+# -p: Loop over the input.
+# -e: Execute the script.
+# The `e` flag in `s/.../.../ge` evaluates the replacement as a Perl expression.
+# This allows us to use an environment variable for the replacement string,
+# avoiding quoting issues with shell variables.
+perl -0777 -i -pe 's#(repositoryURL = "https://github.com/firebase/firebase-ios-sdk\.git";\s*requirement = )\{[^\}]+\};#$1 . $ENV{"REPLACEMENT_VALUE"} . ";"#ge' "$PBXPROJ_PATH" || {
+  echo "Failed to update the Xcode project's SPM dependency."
   exit 1
 }
 
+# Verify that the file was changed.
+UPDATED_CONTENT=$(<"$PBXPROJ_PATH")
+if [[ "$ORIGINAL_CONTENT" == "$UPDATED_CONTENT" ]]; then
+  echo "Failed to find and replace the firebase-ios-sdk dependency. Check the regex pattern and project file structure."
+  exit 1
+}
+
+echo "Successfully updated SPM dependency in $PBXPROJ_PATH"
+
 # Point SPM CI to the tip of `main` of
 # https://github.com/google/GoogleAppMeasurement so that the release process
 # can defer publishing the `GoogleAppMeasurement` tag until after testing.

scripts/setup_quickstart_spm.sh

@@ -86,18 +86,18 @@ if [[ -n "${QUICKSTART_REPO:-}" ]] || check_secrets || [[ ${SAMPLE} == "installa
     fi
     VERSION=$(echo "$LATEST_TAG" | sed 's/CocoaPods-//')
     echo "Setting SPM dependency to latest version: ${VERSION}"
-    swift run --package-path "$scripts_dir/spm-localizer" SPMLocalize "$ABSOLUTE_PROJECT_FILE" --version "$VERSION"
+    "$scripts_dir/quickstart_spm_xcodeproj.sh" "$ABSOLUTE_PROJECT_FILE" --version "$VERSION"
 
   elif [ "$RELEASE_TESTING" == "prerelease_testing" ]; then
     # For prerelease testing, point to the tip of the main branch.
     echo "Setting SPM dependency to the tip of the main branch."
-    swift run --package-path "$scripts_dir/spm-localizer" SPMLocalize "$ABSOLUTE_PROJECT_FILE" --prerelease
+    "$scripts_dir/quickstart_spm_xcodeproj.sh" "$ABSOLUTE_PROJECT_FILE" --prerelease
 
   else
     # For PR testing, point to the current commit.
     CURRENT_REVISION=$(git rev-parse HEAD)
     echo "Setting SPM dependency to current revision: ${CURRENT_REVISION}"
-    swift run --package-path "$scripts_dir/spm-localizer" SPMLocalize "$ABSOLUTE_PROJECT_FILE" --revision "$CURRENT_REVISION"
+    "$scripts_dir/quickstart_spm_xcodeproj.sh" "$ABSOLUTE_PROJECT_FILE" --revision "$CURRENT_REVISION"
   fi
 
 else