Merge 7.5.1 changes to master (#7410)

Author: paulb777

Package.swift

@@ -94,7 +94,7 @@ let package = Package(
     .package(
       name: "GoogleAppMeasurement",
       url: "https://github.com/google/GoogleAppMeasurement.git",
-      .exact("7.5.0")
+      .exact("7.5.1")
     ),
     .package(
       name: "GoogleDataTransport",
@@ -104,7 +104,7 @@ let package = Package(
     .package(
       name: "GoogleUtilities",
       url: "https://github.com/google/GoogleUtilities.git",
-      "7.2.0" ..< "8.0.0"
+      "7.2.1" ..< "8.0.0"
     ),
     .package(
       name: "GTMSessionFetcher",
@@ -149,8 +149,8 @@ let package = Package(
       dependencies: [
         "Firebase",
         "FirebaseCoreDiagnostics",
-        .product(name: "Environment", package: "GoogleUtilities"),
-        .product(name: "Logger", package: "GoogleUtilities"),
+        .product(name: "GULEnvironment", package: "GoogleUtilities"),
+        .product(name: "GULLogger", package: "GoogleUtilities"),
       ],
       path: "FirebaseCore/Sources",
       publicHeadersPath: "Public",
@@ -177,8 +177,8 @@ let package = Package(
       name: "FirebaseCoreDiagnostics",
       dependencies: [
         .product(name: "GoogleDataTransport", package: "GoogleDataTransport"),
-        .product(name: "Environment", package: "GoogleUtilities"),
-        .product(name: "Logger", package: "GoogleUtilities"),
+        .product(name: "GULEnvironment", package: "GoogleUtilities"),
+        .product(name: "GULLogger", package: "GoogleUtilities"),
         .product(name: "nanopb", package: "nanopb"),
       ],
       path: "Firebase/CoreDiagnostics/FIRCDLibrary",
@@ -225,10 +225,10 @@ let package = Package(
                  condition: .when(platforms: [.iOS])),
         "FirebaseCore",
         "FirebaseInstallations",
-        .product(name: "AppDelegateSwizzler", package: "GoogleUtilities"),
-        .product(name: "MethodSwizzler", package: "GoogleUtilities"),
-        .product(name: "NSData", package: "GoogleUtilities"),
-        .product(name: "Network", package: "GoogleUtilities"),
+        .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
+        .product(name: "GULMethodSwizzler", package: "GoogleUtilities"),
+        .product(name: "GULNSData", package: "GoogleUtilities"),
+        .product(name: "GULNetwork", package: "GoogleUtilities"),
         .product(name: "nanopb", package: "nanopb"),
       ],
       path: "FirebaseAnalyticsWrapper",
@@ -257,8 +257,8 @@ let package = Package(
         "FirebaseCore",
         "FirebaseInstallations",
         .product(name: "GoogleDataTransport", package: "GoogleDataTransport"),
-        .product(name: "AppDelegateSwizzler", package: "GoogleUtilities"),
-        .product(name: "UserDefaults", package: "GoogleUtilities"),
+        .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
+        .product(name: "GULUserDefaults", package: "GoogleUtilities"),
       ],
       path: "FirebaseAppDistribution/Sources",
       publicHeadersPath: "Public",
@@ -280,8 +280,8 @@ let package = Package(
       name: "FirebaseAuth",
       dependencies: [
         "FirebaseCore",
-        .product(name: "AppDelegateSwizzler", package: "GoogleUtilities"),
-        .product(name: "Environment", package: "GoogleUtilities"),
+        .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
+        .product(name: "GULEnvironment", package: "GoogleUtilities"),
         .product(name: "GTMSessionFetcherCore", package: "GTMSessionFetcher"),
       ],
       path: "FirebaseAuth/Sources",
@@ -552,7 +552,7 @@ let package = Package(
         "FirebaseCore",
         "FirebaseInstallations",
         "FirebaseABTesting",
-        .product(name: "Environment", package: "GoogleUtilities"),
+        .product(name: "GULEnvironment", package: "GoogleUtilities"),
         .product(name: "nanopb", package: "nanopb"),
       ],
       path: "FirebaseInAppMessaging/Sources",
@@ -575,8 +575,8 @@ let package = Package(
       dependencies: [
         "FirebaseCore",
         "FirebaseInstallations",
-        .product(name: "Environment", package: "GoogleUtilities"),
-        .product(name: "UserDefaults", package: "GoogleUtilities"),
+        .product(name: "GULEnvironment", package: "GoogleUtilities"),
+        .product(name: "GULUserDefaults", package: "GoogleUtilities"),
       ],
       path: "Firebase/InstanceID",
       exclude: [
@@ -593,8 +593,8 @@ let package = Package(
       dependencies: [
         "FirebaseCore",
         .product(name: "FBLPromises", package: "Promises"),
-        .product(name: "Environment", package: "GoogleUtilities"),
-        .product(name: "UserDefaults", package: "GoogleUtilities"),
+        .product(name: "GULEnvironment", package: "GoogleUtilities"),
+        .product(name: "GULUserDefaults", package: "GoogleUtilities"),
       ],
       path: "FirebaseInstallations/Source/Library",
       publicHeadersPath: "Public",
@@ -611,7 +611,7 @@ let package = Package(
       dependencies: [
         "FirebaseCore",
         "FirebaseInstallations",
-        .product(name: "Logger", package: "GoogleUtilities"),
+        .product(name: "GULLogger", package: "GoogleUtilities"),
         "SwiftProtobuf",
       ],
       path: "FirebaseMLModelDownloader/Sources",
@@ -633,10 +633,10 @@ let package = Package(
       dependencies: [
         "FirebaseCore",
         "FirebaseInstanceID",
-        .product(name: "AppDelegateSwizzler", package: "GoogleUtilities"),
-        .product(name: "Environment", package: "GoogleUtilities"),
-        .product(name: "Reachability", package: "GoogleUtilities"),
-        .product(name: "UserDefaults", package: "GoogleUtilities"),
+        .product(name: "GULAppDelegateSwizzler", package: "GoogleUtilities"),
+        .product(name: "GULEnvironment", package: "GoogleUtilities"),
+        .product(name: "GULReachability", package: "GoogleUtilities"),
+        .product(name: "GULUserDefaults", package: "GoogleUtilities"),
       ],
       path: "FirebaseMessaging/Sources",
       publicHeadersPath: "Public",
@@ -682,7 +682,7 @@ let package = Package(
         "FirebaseCore",
         "FirebaseABTesting",
         "FirebaseInstallations",
-        .product(name: "NSData", package: "GoogleUtilities"),
+        .product(name: "GULNSData", package: "GoogleUtilities"),
       ],
       path: "FirebaseRemoteConfig/Sources",
       publicHeadersPath: "Public",