Fix GoogleAppMeasurement SPM CI (#8606)

Author: paulb777

Package.swift

@@ -147,9 +147,9 @@ let package = Package(
     .package(
       name: "GoogleAppMeasurement",
       url: "https://github.com/google/GoogleAppMeasurement.git",
-      // Please keep the version specification aligned with
-      // scripts/setup_spm_test_app_measurement.sh.
-      .exact("8.3.1")
+      // Note that CI changes the version to the head of main for CI.
+      // See scripts/setup_spm_tests.sh.
+      .exact("8.7.0")
     ),
     .package(
       name: "GoogleDataTransport",
@@ -302,8 +302,8 @@ let package = Package(
     ),
     .binaryTarget(
       name: "FirebaseAnalytics",
-      url: "https://dl.google.com/firebase/ios/swiftpm/8.3.0/FirebaseAnalytics.zip",
-      checksum: "3225b785ef2884889b41216150d000ccac3aa9d5e9bebbd993a63725503949e5"
+      url: "https://dl.google.com/firebase/ios/swiftpm/8.7.0/FirebaseAnalytics.zip",
+      checksum: "063f03bc6d6bd1efbd3057a64977aef3e6fac4e0a761fc30af1acd554212164c"
     ),
     .target(
       name: "FirebaseAnalyticsSwiftTarget",

scripts/build.sh

@@ -648,7 +648,6 @@ case "$product-$platform-$method" in
 
   # Note that the combine tests require setting the minimum iOS and tvOS version to 13.0
   *-*-spm)
-    "${scripts_dir}/setup_spm_test_app_measurement.sh"
     RunXcodebuild \
       -scheme $product \
       "${xcb_flags[@]}" \
@@ -658,7 +657,6 @@ case "$product-$platform-$method" in
     ;;
 
   *-*-spmbuildonly)
-    "${scripts_dir}/setup_spm_test_app_measurement.sh"
     RunXcodebuild \
       -scheme $product \
       "${xcb_flags[@]}" \

scripts/setup_spm_test_app_measurement.sh

@@ -14,6 +14,16 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+
+# Point SPM CI to the tip of main of https://github.com/google/GoogleAppMeasurement
+# so that the release process can defer publish the GoogleAppMeasurement tag
+# until after testing.
+
+# For example: Change `.exact("8.3.1")` to `.branch("main")`
+
+sed -i '' 's#exact("[0-9.]*#branch("main#' Package.swift
+
+
 # Move schemes into place to run Swift Package Manager tests
 # These cannot be stored in the correct location because they cause
 # clutter for SDK clients.