From bad105c1c6b7bfdedc57111bd485a5e644538374 Mon Sep 17 00:00:00 2001
From: Maksym Malyhin <mmaksym@google.com>
Date: Tue, 2 Mar 2021 15:23:26 -0500
Subject: [PATCH 01/33] Add prefix to constant name to avoid name conflicts
 (#10)

* Add prefix to constant name to avoid name conflicts

* Move the internal constant out of the

* Changelog
---
 CHANGELOG.md                                               | 2 ++
 GoogleUtilities/ISASwizzler/GULObjectSwizzler+Internal.h   | 2 ++
 GoogleUtilities/ISASwizzler/GULObjectSwizzler.m            | 7 ++++---
 GoogleUtilities/ISASwizzler/GULSwizzledObject.m            | 4 ++--
 .../ISASwizzler/Public/GoogleUtilities/GULSwizzledObject.h | 2 --
 .../Tests/Unit/Swizzler/GULObjectSwizzlerTest.m            | 6 +++---
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9ad256..5c8a166 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,5 @@
+# 7.3.0
+- Fix conflicting internal constant name and move it out of the public header. (#7635)
 # 7.2.2
 - Fix warnings introduced with Xcode 12.5. (#8)
 
diff --git a/GoogleUtilities/ISASwizzler/GULObjectSwizzler+Internal.h b/GoogleUtilities/ISASwizzler/GULObjectSwizzler+Internal.h
index 2b09108..26d8655 100644
--- a/GoogleUtilities/ISASwizzler/GULObjectSwizzler+Internal.h
+++ b/GoogleUtilities/ISASwizzler/GULObjectSwizzler+Internal.h
@@ -14,6 +14,8 @@
 
 #import "GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULObjectSwizzler.h"
 
+FOUNDATION_EXPORT NSString *kGULSwizzlerAssociatedObjectKey;
+
 @interface GULObjectSwizzler (Internal)
 
 - (void)swizzledObjectHasBeenDeallocatedWithGeneratedSubclass:(BOOL)isInstanceOfGeneratedSubclass;
diff --git a/GoogleUtilities/ISASwizzler/GULObjectSwizzler.m b/GoogleUtilities/ISASwizzler/GULObjectSwizzler.m
index d4bbefd..e147b53 100644
--- a/GoogleUtilities/ISASwizzler/GULObjectSwizzler.m
+++ b/GoogleUtilities/ISASwizzler/GULObjectSwizzler.m
@@ -16,6 +16,7 @@
 
 #import <objc/runtime.h>
 
+#import "GoogleUtilities/ISASwizzler/GULObjectSwizzler+Internal.h"
 #import "GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULSwizzledObject.h"
 
 @implementation GULObjectSwizzler {
@@ -80,7 +81,7 @@
   }
 
   GULObjectSwizzler *existingSwizzler =
-      [[self class] getAssociatedObject:object key:kSwizzlerAssociatedObjectKey];
+      [[self class] getAssociatedObject:object key:kGULSwizzlerAssociatedObjectKey];
   if ([existingSwizzler isKindOfClass:[GULObjectSwizzler class]]) {
     // The object has been swizzled already, no need to swizzle again.
     return existingSwizzler;
@@ -130,7 +131,7 @@
   __strong id swizzledObject = _swizzledObject;
 
   GULObjectSwizzler *existingSwizzler =
-      [[self class] getAssociatedObject:swizzledObject key:kSwizzlerAssociatedObjectKey];
+      [[self class] getAssociatedObject:swizzledObject key:kGULSwizzlerAssociatedObjectKey];
   if (existingSwizzler != nil) {
     NSAssert(existingSwizzler == self, @"The swizzled object has a different swizzler.");
     // The object has been swizzled already.
@@ -139,7 +140,7 @@
 
   if (swizzledObject) {
     [GULObjectSwizzler setAssociatedObject:swizzledObject
-                                       key:kSwizzlerAssociatedObjectKey
+                                       key:kGULSwizzlerAssociatedObjectKey
                                      value:self
                                association:GUL_ASSOCIATION_RETAIN];
 
diff --git a/GoogleUtilities/ISASwizzler/GULSwizzledObject.m b/GoogleUtilities/ISASwizzler/GULSwizzledObject.m
index 6ea7028..bf3c707 100644
--- a/GoogleUtilities/ISASwizzler/GULSwizzledObject.m
+++ b/GoogleUtilities/ISASwizzler/GULSwizzledObject.m
@@ -17,7 +17,7 @@
 #import "GoogleUtilities/ISASwizzler/GULObjectSwizzler+Internal.h"
 #import "GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULSwizzledObject.h"
 
-NSString *kSwizzlerAssociatedObjectKey = @"gul_objectSwizzler";
+NSString *kGULSwizzlerAssociatedObjectKey = @"gul_objectSwizzler";
 
 @interface GULSwizzledObject ()
 
@@ -46,7 +46,7 @@ NSString *kSwizzlerAssociatedObjectKey = @"gul_objectSwizzler";
 }
 
 - (GULObjectSwizzler *)gul_objectSwizzler {
-  return [GULObjectSwizzler getAssociatedObject:self key:kSwizzlerAssociatedObjectKey];
+  return [GULObjectSwizzler getAssociatedObject:self key:kGULSwizzlerAssociatedObjectKey];
 }
 
 #pragma mark - Donor methods
diff --git a/GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULSwizzledObject.h b/GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULSwizzledObject.h
index 314ceec..fc07f0a 100644
--- a/GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULSwizzledObject.h
+++ b/GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULSwizzledObject.h
@@ -18,8 +18,6 @@
 
 @class GULObjectSwizzler;
 
-FOUNDATION_EXPORT NSString *kSwizzlerAssociatedObjectKey;
-
 /** This class exists as a method donor. These methods will be added to all objects that are
  *  swizzled by the object swizzler. This class should not be instantiated.
  */
diff --git a/GoogleUtilities/Tests/Unit/Swizzler/GULObjectSwizzlerTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULObjectSwizzlerTest.m
index a6a2c4d..29b6150 100644
--- a/GoogleUtilities/Tests/Unit/Swizzler/GULObjectSwizzlerTest.m
+++ b/GoogleUtilities/Tests/Unit/Swizzler/GULObjectSwizzlerTest.m
@@ -15,7 +15,7 @@
 #import <XCTest/XCTest.h>
 #import <objc/runtime.h>
 
-#import "GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULObjectSwizzler.h"
+#import "GoogleUtilities/ISASwizzler/GULObjectSwizzler+Internal.h"
 #import "GoogleUtilities/ISASwizzler/Public/GoogleUtilities/GULSwizzledObject.h"
 #import "GoogleUtilities/SwizzlerTestHelpers/GULProxy.h"
 
@@ -390,7 +390,7 @@
 
     // Release GULObjectSwizzler
     [GULObjectSwizzler setAssociatedObject:object
-                                       key:kSwizzlerAssociatedObjectKey
+                                       key:kGULSwizzlerAssociatedObjectKey
                                      value:nil
                                association:GUL_ASSOCIATION_RETAIN];
 
@@ -434,7 +434,7 @@
 
     // Release GULObjectSwizzler
     [GULObjectSwizzler setAssociatedObject:object
-                                       key:kSwizzlerAssociatedObjectKey
+                                       key:kGULSwizzlerAssociatedObjectKey
                                      value:nil
                                association:GUL_ASSOCIATION_RETAIN];
 

From 1c47ea135322768023ecdcc9db79bf3df821209f Mon Sep 17 00:00:00 2001
From: Ryan Wilson <wilsonryan@google.com>
Date: Wed, 3 Mar 2021 13:28:33 -0500
Subject: [PATCH 02/33] Bump version for M91 (#11)

---
 GoogleUtilities.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index 2dcd5d6..ad96289 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.2.2'
+  s.version          = '7.3.0'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC

From 539493bf0c45097dc9b76afba260623301b6bfe6 Mon Sep 17 00:00:00 2001
From: Maksym Malyhin <mmaksym@google.com>
Date: Mon, 15 Mar 2021 12:58:37 -0400
Subject: [PATCH 03/33] Add explicit dependency on Security framework to
 Environment subspec (#12)

* Add explicit dependency on Security framework to Environment subspec

* Bump podspec version

* Changelog
---
 CHANGELOG.md            | 3 +++
 GoogleUtilities.podspec | 5 ++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c8a166..3a9af55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 7.3.1
+- Add explicit dependency on Security framework to Environment subspec. (#12)
+
 # 7.3.0
 - Fix conflicting internal constant name and move it out of the public header. (#7635)
 # 7.2.2
diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index ad96289..c7a981d 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.3.0'
+  s.version          = '7.3.1'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC
@@ -39,6 +39,9 @@ other Google CocoaPods. They're not intended for direct public usage.
     es.source_files = 'GoogleUtilities/Environment/**/*.[mh]'
     es.public_header_files = 'GoogleUtilities/Environment/Public/GoogleUtilities/*.h'
     es.dependency 'PromisesObjC', '~> 1.2'
+    es.frameworks = [
+      'Security'
+    ]
   end
 
   s.subspec 'Logger' do |ls|

From f74d187874e6421c0c6a2c9242f86b41910008a3 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 23 Mar 2021 15:23:33 -0700
Subject: [PATCH 04/33] Initial issue templates (#16)

---
 .github/ISSUE_TEMPLATE/config.yml      | 6 ++++++
 .github/ISSUE_TEMPLATE/issue_report.md | 9 +++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/config.yml
 create mode 100644 .github/ISSUE_TEMPLATE/issue_report.md

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..0d4c3c1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,6 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Google Utilities
+    url: https://github.com/firebase/firebase-ios-sdk/issues/new/choose
+    about: Google Utilities is not supported for direct usage. Please file the issue with the
+    product library that depends on Google Utilities instead of in this repository.
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
new file mode 100644
index 0000000..95023f8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -0,0 +1,9 @@
+---
+name: 🐞 Internal Issue
+about: Googlers may file issues here or to track with Firebase use
+       https://github.com/firebase/firebase-ios-sdk/issues/new/choose
+---
+<!-- DO NOT DELETE
+validate_template=true
+template_path=.github/ISSUE_TEMPLATE/bug_report.md
+-->

From 1e0f385577a122bd935881cdcb24dbd1aa642663 Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Tue, 23 Mar 2021 16:08:36 -0700
Subject: [PATCH 05/33] Issue Template fixes (#17)

---
 .github/ISSUE_TEMPLATE/config.yml      | 3 +--
 .github/ISSUE_TEMPLATE/issue_report.md | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 0d4c3c1..29250d1 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -2,5 +2,4 @@ blank_issues_enabled: false
 contact_links:
   - name: Google Utilities
     url: https://github.com/firebase/firebase-ios-sdk/issues/new/choose
-    about: Google Utilities is not supported for direct usage. Please file the issue with the
-    product library that depends on Google Utilities instead of in this repository.
+    about: Google Utilities is not supported for direct usage. Please file with the product library that depends on Google Utilities.
diff --git a/.github/ISSUE_TEMPLATE/issue_report.md b/.github/ISSUE_TEMPLATE/issue_report.md
index 95023f8..31f1511 100644
--- a/.github/ISSUE_TEMPLATE/issue_report.md
+++ b/.github/ISSUE_TEMPLATE/issue_report.md
@@ -1,7 +1,6 @@
 ---
 name: 🐞 Internal Issue
-about: Googlers may file issues here or to track with Firebase use
-       https://github.com/firebase/firebase-ios-sdk/issues/new/choose
+about: Googlers may file issues here or to track with [Firebase](https://github.com/firebase/firebase-ios-sdk/issues/new/choose)
 ---
 <!-- DO NOT DELETE
 validate_template=true

From 0faf34d4b55fb9d048e2082ebed9fea5e97412e0 Mon Sep 17 00:00:00 2001
From: Gran <ollkorrect999@gmail.com>
Date: Wed, 24 Mar 2021 16:18:37 -0700
Subject: [PATCH 06/33] Add code coverage workflow (#13)

Add unit and unit-swift tests to test coverage.
---
 .github/workflows/test_coverage.yml | 79 +++++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 .github/workflows/test_coverage.yml

diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml
new file mode 100644
index 0000000..4b87197
--- /dev/null
+++ b/.github/workflows/test_coverage.yml
@@ -0,0 +1,79 @@
+name: test_coverage
+
+on:
+  pull_request:
+    # open will be triggered when a pull request is created.
+    # synchronize will be triggered when a pull request has new commits.
+    # closed will be triggered when a pull request is closed.
+    types: [opened, synchronize, closed]
+
+env:
+  METRICS_SERVICE_SECRET: ${{ secrets.GHASecretsGPGPassphrase1 }}
+
+jobs:
+  pod_lib_lint:
+    if: github.repository == 'google/GoogleUtilities' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.pull_request.merged)
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        target: [ios]
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup Scripts Directory
+      run: ./setup-scripts.sh
+    - name: Setup Bundler
+      run: ./scripts/setup_bundler.sh
+    - name: PodLibLint DataTransport
+      run: |
+        scripts/code_coverage_report/pod_test_code_coverage_report.sh --sdk=GoogleUtilities --platform=${{ matrix.target }} --test_spec=unit,unit-swift --output_path="/Users/runner/GoogleUtilities-ios-unit.xcresult"
+    - uses: actions/upload-artifact@v2
+      with:
+        name: codecoverage
+        path: /Users/runner/*.xcresult
+  manage_test_results:
+    if: github.repository == 'google/GoogleUtilities' && (github.event.action == 'synchronize' || github.event.action == 'opened' || github.event.pull_request.merged)
+    needs: pod_lib_lint
+    runs-on: macOS-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+    - uses: actions/download-artifact@v2
+      id: download
+      with:
+        path: /Users/runner/test
+    - name: Setup Scripts Directory
+      run: ./setup-scripts.sh
+    - name: Access to Metrics Service
+      if:  ${{ env.METRICS_SERVICE_SECRET }}
+      run: |
+        # Install gcloud sdk
+        curl https://sdk.cloud.google.com > install.sh
+        bash install.sh --disable-prompts
+        echo "${HOME}/google-cloud-sdk/bin/" >> $GITHUB_PATH
+        export PATH="${HOME}/google-cloud-sdk/bin/:${PATH}"
+
+        # Activate the service account for Metrics Service.
+        scripts/decrypt_gha_secret.sh scripts/gha-encrypted/metrics_service_access.json.gpg \
+        metrics-access.json "${{ env.METRICS_SERVICE_SECRET }}"
+        gcloud auth activate-service-account --key-file metrics-access.json
+    - name: Build code coverage tool
+      run: |
+        cd firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/
+        swift build
+    - name: Generate report
+      if: github.event.pull_request.merged != true && ${{ env.METRICS_SERVICE_SECRET }}
+      env:
+        pr_branch: ${{ github.event.pull_request.head.ref }}
+      run: |
+        common_commit=$(git merge-base remotes/origin/${pr_branch} remotes/origin/main)
+        GITHUB_SHA=$(cat $GITHUB_EVENT_PATH | jq -r .pull_request.head.sha)
+        if [ -d "${{steps.download.outputs.download-path}}" ]; then
+        firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/.build/debug/CoverageReportGenerator --presubmit "google/GoogleUtilities" --commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "${{steps.download.outputs.download-path}}/codecoverage" --log-link "https://github.com/google/GoogleUtilities/actions/runs/${GITHUB_RUN_ID}" --pull-request-num ${{github.event.pull_request.number}} --base-commit "$common_commit"
+        fi
+    - name: Update New Coverage Data
+      if: github.event.pull_request.merged == true && ${{ env.METRICS_SERVICE_SECRET }}
+      run: |
+        if [ -d "${{steps.download.outputs.download-path}}" ]; then
+        firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/.build/debug/CoverageReportGenerator --merge "google/GoogleUtilities" --commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "${{steps.download.outputs.download-path}}/codecoverage" --log-link "https://github.com/google/GoogleUtilities/actions/runs/${GITHUB_RUN_ID}" --branch "${GITHUB_REF##*/}"
+        fi

From 75beff780a10af222167841975e052e495f9d061 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Mon, 12 Apr 2021 12:27:04 -0400
Subject: [PATCH 07/33] Change heartbeat directory name and refactor file (#19)

---
 .../Environment/GULHeartbeatDateStorage.m     | 116 +++++++++---------
 .../GoogleUtilities/GULHeartbeatDateStorage.h |   3 +
 .../Environment/GULHeartbeatDateStorageTest.m |   2 +-
 3 files changed, 62 insertions(+), 59 deletions(-)

diff --git a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
index d36cfde..affdf76 100644
--- a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
+++ b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
@@ -17,6 +17,8 @@
 #import "GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h"
 #import "GoogleUtilities/Environment/Public/GoogleUtilities/GULSecureCoding.h"
 
+NSString *const kGULHeartbeatStorageDirectory = @"GoogleHeartbeatStorage";
+
 @interface GULHeartbeatDateStorage ()
 /** The storage to store the date of the last sent heartbeat. */
 @property(nonatomic, readonly) NSFileCoordinator *fileCoordinator;
@@ -29,9 +31,7 @@
 @synthesize fileURL = _fileURL;
 
 - (instancetype)initWithFileName:(NSString *)fileName {
-  if (fileName == nil) {
-    return nil;
-  }
+  if (fileName == nil) return nil;
 
   self = [super init];
   if (self) {
@@ -41,13 +41,13 @@
   return self;
 }
 
-/** Lazy getter for fileURL
+/** Lazy getter for fileURL.
  * @return fileURL where heartbeat information is stored.
  */
 - (NSURL *)fileURL {
   if (!_fileURL) {
-    NSURL *directoryURL = [[self class] directoryPathURL];
-    [[self class] checkAndCreateDirectory:directoryURL fileCoordinator:_fileCoordinator];
+    NSURL *directoryURL = [self directoryPathURL];
+    [self checkAndCreateDirectory:directoryURL];
     _fileURL = [directoryURL URLByAppendingPathComponent:_fileName];
   }
   return _fileURL;
@@ -56,36 +56,32 @@
 /** Returns the URL path of the directory for heartbeat storage data.
  * @return the URL path of the directory for heartbeat storage data.
  */
-+ (NSURL *)directoryPathURL {
+- (NSURL *)directoryPathURL {
+  NSArray<NSString *> *paths;
 #if TARGET_OS_TV
-  NSArray<NSString *> *paths =
-      NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+  paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
 #else
-  NSArray<NSString *> *paths =
-      NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
-#endif
-  NSArray<NSString *> *components = @[ paths.lastObject, @"Google/FIRApp" ];
-  NSString *directoryString = [NSString pathWithComponents:components];
-  NSURL *directoryURL = [NSURL fileURLWithPath:directoryString];
+  paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+#endif  // TARGET_OS_TV
+  NSString *rootPath = [paths firstObject];
+  NSURL *rootURL = [NSURL fileURLWithPath:rootPath];
+  NSURL *directoryURL = [rootURL URLByAppendingPathComponent:kGULHeartbeatStorageDirectory];
   return directoryURL;
 }
 
-/** Checks and creates a directory for the directory specified by the
- * directory url
- * @param directoryPathURL The path to the directory which needs to be created.
- * @param fileCoordinator The fileCoordinator object to coordinate writes to the directory.
+/** Check for the existence of the directory specified by the URL, and create it if it does not
+ * exist.
+ * @param directoryPathURL The path to the directory that needs to exist.
  */
-+ (void)checkAndCreateDirectory:(NSURL *)directoryPathURL
-                fileCoordinator:(NSFileCoordinator *)fileCoordinator {
+- (void)checkAndCreateDirectory:(NSURL *)directoryPathURL {
   NSError *fileCoordinatorError = nil;
-  [fileCoordinator
+  [self.fileCoordinator
       coordinateWritingItemAtURL:directoryPathURL
                          options:0
                            error:&fileCoordinatorError
                       byAccessor:^(NSURL *writingDirectoryURL) {
                         NSError *error;
                         if (![writingDirectoryURL checkResourceIsReachableAndReturnError:&error]) {
-                          // If fail creating the Application Support directory, log warning.
                           NSError *error;
                           [[NSFileManager defaultManager] createDirectoryAtURL:writingDirectoryURL
                                                    withIntermediateDirectories:YES
@@ -95,65 +91,69 @@
                       }];
 }
 
-- (nullable NSMutableDictionary *)heartbeatDictionaryWithFileURL:(NSURL *)readingFileURL {
+- (nullable NSDictionary *)heartbeatDictionaryWithFileURL:(NSURL *)readingFileURL {
+  NSDictionary *heartbeatDictionary;
+
   NSError *error;
-  NSMutableDictionary *dict;
   NSData *objectData = [NSData dataWithContentsOfURL:readingFileURL options:0 error:&error];
-  if (objectData == nil || error != nil) {
-    dict = [NSMutableDictionary dictionary];
-  } else {
-    dict = [GULSecureCoding
-        unarchivedObjectOfClasses:[NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]]
-                         fromData:objectData
-                            error:&error];
-    if (dict == nil || error != nil) {
-      dict = [NSMutableDictionary dictionary];
-    }
+
+  if (objectData.length > 0 && error == nil) {
+    NSSet<Class> *objectClasses = [NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]];
+    heartbeatDictionary = [GULSecureCoding unarchivedObjectOfClasses:objectClasses
+                                                            fromData:objectData
+                                                               error:&error];
   }
-  return dict;
+
+  if (heartbeatDictionary.count == 0 || error != nil) {
+    heartbeatDictionary = [NSDictionary dictionary];
+  }
+
+  return heartbeatDictionary;
 }
 
 - (nullable NSDate *)heartbeatDateForTag:(NSString *)tag {
-  __block NSMutableDictionary *dict;
+  __block NSDictionary *heartbeatDictionary;
   NSError *error;
   [self.fileCoordinator coordinateReadingItemAtURL:self.fileURL
                                            options:0
                                              error:&error
                                         byAccessor:^(NSURL *readingURL) {
-                                          dict = [self heartbeatDictionaryWithFileURL:readingURL];
+                                          heartbeatDictionary =
+                                              [self heartbeatDictionaryWithFileURL:readingURL];
                                         }];
-  return dict[tag];
+  return heartbeatDictionary[tag];
 }
 
 - (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag {
   NSError *error;
   __block BOOL isSuccess = false;
-  [self.fileCoordinator coordinateReadingItemAtURL:self.fileURL
-                                           options:0
-                                  writingItemAtURL:self.fileURL
-                                           options:0
-                                             error:&error
-                                        byAccessor:^(NSURL *readingURL, NSURL *writingURL) {
-                                          NSMutableDictionary *dictionary =
-                                              [self heartbeatDictionaryWithFileURL:readingURL];
-                                          dictionary[tag] = date;
-                                          NSError *error;
-                                          isSuccess = [self writeDictionary:dictionary
-                                                              forWritingURL:writingURL
-                                                                      error:&error];
-                                        }];
+  [self.fileCoordinator
+      coordinateReadingItemAtURL:self.fileURL
+                         options:0
+                writingItemAtURL:self.fileURL
+                         options:0
+                           error:&error
+                      byAccessor:^(NSURL *readingURL, NSURL *writingURL) {
+                        NSMutableDictionary *heartbeatDictionary =
+                            [[self heartbeatDictionaryWithFileURL:readingURL] mutableCopy];
+                        heartbeatDictionary[tag] = date;
+                        NSError *error;
+                        isSuccess = [self writeDictionary:heartbeatDictionary.copy
+                                            forWritingURL:writingURL
+                                                    error:&error];
+                      }];
   return isSuccess;
 }
 
-- (BOOL)writeDictionary:(NSMutableDictionary *)dictionary
+- (BOOL)writeDictionary:(NSDictionary *)dictionary
           forWritingURL:(NSURL *)writingFileURL
                   error:(NSError **)outError {
   NSData *data = [GULSecureCoding archivedDataWithRootObject:dictionary error:outError];
-  if (*outError != nil) {
-    return false;
-  } else {
-    return [data writeToURL:writingFileURL atomically:YES];
+  if (data.length == 0) {
+    return NO;
   }
+
+  return [data writeToURL:writingFileURL atomically:YES];
 }
 
 @end
diff --git a/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h b/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h
index 9432dfc..69623a6 100644
--- a/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h
+++ b/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h
@@ -18,6 +18,9 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
+/// The name of the directory where the heartbeat data is stored.
+extern NSString *const kGULHeartbeatStorageDirectory;
+
 /// Stores either a date or a dictionary to a specified file.
 @interface GULHeartbeatDateStorage : NSObject
 
diff --git a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
index 096cf15..250f4e3 100644
--- a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
+++ b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
@@ -81,7 +81,7 @@ static NSString *const kTestFileName = @"GULStorageHeartbeatTest";
       NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
 #endif
   NSString *rootPath = [path firstObject];
-  NSArray<NSString *> *components = @[ rootPath, @"Google/FIRApp", kTestFileName ];
+  NSArray<NSString *> *components = @[ rootPath, kGULHeartbeatStorageDirectory, kTestFileName ];
   NSString *fileString = [NSString pathWithComponents:components];
   NSURL *fileURL = [NSURL fileURLWithPath:fileString];
   return fileURL;

From 88f34d4baa812e2b2e2be671a5dffb61e6495ce0 Mon Sep 17 00:00:00 2001
From: Gran <granluo@google.com>
Date: Mon, 12 Apr 2021 10:28:10 -0700
Subject: [PATCH 08/33] Disable jobs when secrets are not available (#20)

The previous setup will always run two jobs in sequence. The workflow will fail while `Generate report` job runs for postsubmit/merge since pr_branch cannot be fetched properly. Also, this job should not run in postsubmit/merge.
---
 .github/workflows/test_coverage.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml
index 4b87197..207323d 100644
--- a/.github/workflows/test_coverage.yml
+++ b/.github/workflows/test_coverage.yml
@@ -62,7 +62,7 @@ jobs:
         cd firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/
         swift build
     - name: Generate report
-      if: github.event.pull_request.merged != true && ${{ env.METRICS_SERVICE_SECRET }}
+      if: github.event.pull_request.merged != true && env.METRICS_SERVICE_SECRET
       env:
         pr_branch: ${{ github.event.pull_request.head.ref }}
       run: |
@@ -72,7 +72,7 @@ jobs:
         firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/.build/debug/CoverageReportGenerator --presubmit "google/GoogleUtilities" --commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "${{steps.download.outputs.download-path}}/codecoverage" --log-link "https://github.com/google/GoogleUtilities/actions/runs/${GITHUB_RUN_ID}" --pull-request-num ${{github.event.pull_request.number}} --base-commit "$common_commit"
         fi
     - name: Update New Coverage Data
-      if: github.event.pull_request.merged == true && ${{ env.METRICS_SERVICE_SECRET }}
+      if: github.event.pull_request.merged == true && env.METRICS_SERVICE_SECRET
       run: |
         if [ -d "${{steps.download.outputs.download-path}}" ]; then
         firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/.build/debug/CoverageReportGenerator --merge "google/GoogleUtilities" --commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "${{steps.download.outputs.download-path}}/codecoverage" --log-link "https://github.com/google/GoogleUtilities/actions/runs/${GITHUB_RUN_ID}" --branch "${GITHUB_REF##*/}"

From f189407a1c0898792d7b253ef5178379515976e2 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Mon, 12 Apr 2021 13:30:39 -0400
Subject: [PATCH 09/33] Update CHANGELOG.md

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3a9af55..9dd2eed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,8 +1,12 @@
+# 7.3.2
+- Change heartbeat directory name and refactor file. (#19)
+
 # 7.3.1
 - Add explicit dependency on Security framework to Environment subspec. (#12)
 
 # 7.3.0
 - Fix conflicting internal constant name and move it out of the public header. (#7635)
+
 # 7.2.2
 - Fix warnings introduced with Xcode 12.5. (#8)
 

From 36fe49a5c2a3d286e8f5756979a089fc7c86b6cb Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Mon, 12 Apr 2021 16:09:53 -0400
Subject: [PATCH 10/33] Update podspec version to 7.3.2 (#21)

---
 GoogleUtilities.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index c7a981d..11a32c8 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.3.1'
+  s.version          = '7.3.2'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC

From 2ff73dd68f54d9f3efb0b31e8459963b40f6dd93 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 13 Apr 2021 11:00:44 -0400
Subject: [PATCH 11/33] Update README.md (#22)

* Update README.md

* Remove trailing whitespace

* Remove trailing whitespace 2
---
 README.md | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c34a73c..3287d2c 100644
--- a/README.md
+++ b/README.md
@@ -16,12 +16,16 @@ These instructions apply to minor and patch version updates. Major versions need
 a customized adaptation.
 
 After the CI is green:
-  * Update the version in the podspec
+  * Update the version in the podspec to match the latest entry in the [CHANGELOG.md](CHANGELOG.md)
   * Add the CocoaPods tag
+    * Checkout the `main` branch.
     * `git tag CocoaPods-{version}`
     * `git push origin CocoaPods-{version}`
   * Push the podspec to SpecsStaging
-    * `pod repo push staging GoogleUtilities.podspec`
+    * `pod repo push --skip-tests staging GoogleUtilities.podspec`
+
+    If the command fails with `Unable to find the 'staging' repo.`, add the staging repo with:
+    * `pod repo add staging https://github.com/firebase/SpecsStaging.git`
   * Run Firebase CI by waiting until next nightly or adding a PR that touches `Gemfile`
   * On google3, copybara and run a global TAP
     * `third_party/firebase/ios/Releases/run_copy_bara.py --directory GoogleUtilities`
@@ -76,7 +80,7 @@ before creating a PR.
 GitHub Actions will verify that any code changes are done in a style compliant
 way. Install `clang-format` and `mint`:
 
-```
+```console
 brew install clang-format@11
 brew install mint
 ```

From 01116e8b6fca4b78f9450a91f32570fd7fe6804f Mon Sep 17 00:00:00 2001
From: Ryan Wilson <wilsonryan@google.com>
Date: Tue, 13 Apr 2021 15:18:20 -0400
Subject: [PATCH 12/33] Introduce UserDefaults based heartbeat storage. (#23)

* Introduce UserDefaults based heartbeat storage.

This can be used on tvOS without fear of losing data between launches.
Clients will need to instantiate the class of their choice, then can use the
`GULHeartbeatDateStorable` protocol if they want to mix and match.

* Fix PR number in CHANGELOG

* Style.sh

* Bump version in podspec.

* Renamed files appropriately

* Copyright fixes
---
 CHANGELOG.md                                  |  3 +-
 GoogleUtilities.podspec                       |  2 +-
 .../GULHeartbeatDateStorageUserDefaults.m     | 68 +++++++++++++++++++
 .../GULHeartbeatDateStorable.h                | 40 +++++++++++
 .../GoogleUtilities/GULHeartbeatDateStorage.h |  4 +-
 .../GULHeartbeatDateStorageUserDefaults.h     | 51 ++++++++++++++
 .../Environment/GULHeartbeatDateStorageTest.m |  4 ++
 .../GULHeartbeatDateStorageUserDefaultsTest.m | 58 ++++++++++++++++
 8 files changed, 227 insertions(+), 3 deletions(-)
 create mode 100644 GoogleUtilities/Environment/GULHeartbeatDateStorageUserDefaults.m
 create mode 100644 GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorable.h
 create mode 100644 GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorageUserDefaults.h
 create mode 100644 GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageUserDefaultsTest.m

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9dd2eed..73215a0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
-# 7.3.2
+# 7.4.0
 - Change heartbeat directory name and refactor file. (#19)
+- Introduce user defaults based heartbeat storage. (#23)
 
 # 7.3.1
 - Add explicit dependency on Security framework to Environment subspec. (#12)
diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index 11a32c8..437a4e7 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.3.2'
+  s.version          = '7.4.0'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC
diff --git a/GoogleUtilities/Environment/GULHeartbeatDateStorageUserDefaults.m b/GoogleUtilities/Environment/GULHeartbeatDateStorageUserDefaults.m
new file mode 100644
index 0000000..604f866
--- /dev/null
+++ b/GoogleUtilities/Environment/GULHeartbeatDateStorageUserDefaults.m
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import "GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorageUserDefaults.h"
+
+@interface GULHeartbeatDateStorageUserDefaults ()
+
+/** The storage to store the date of the last sent heartbeat. */
+@property(nonatomic, readonly) NSUserDefaults *userDefaults;
+
+/** The key for user defaults to store heartbeat information. */
+@property(nonatomic, readonly) NSString *key;
+
+@end
+
+@implementation GULHeartbeatDateStorageUserDefaults
+
+- (instancetype)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key {
+  self = [super init];
+  if (self) {
+    _userDefaults = defaults;
+    _key = key;
+  }
+  return self;
+}
+
+- (nullable NSMutableDictionary *)heartbeatDictionaryFromDefaults {
+  NSDictionary *heartbeatDict = [self.userDefaults objectForKey:self.key];
+  if (heartbeatDict != nil) {
+    return [heartbeatDict mutableCopy];
+  } else {
+    return [NSMutableDictionary dictionary];
+  }
+}
+
+- (nullable NSDate *)heartbeatDateForTag:(NSString *)tag {
+  NSDate *date = nil;
+  @synchronized(self.userDefaults) {
+    NSMutableDictionary *dict = [self heartbeatDictionaryFromDefaults];
+    date = dict[tag];
+  }
+
+  return date;
+}
+
+- (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag {
+  @synchronized(self.userDefaults) {
+    NSMutableDictionary *dict = [self heartbeatDictionaryFromDefaults];
+    dict[tag] = date;
+    [self.userDefaults setObject:dict forKey:self.key];
+  }
+  return true;
+}
+
+@end
diff --git a/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorable.h b/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorable.h
new file mode 100644
index 0000000..43d3740
--- /dev/null
+++ b/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorable.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/**
+ * Describes an object that can store and fetch heartbeat dates for given tags.
+ */
+@protocol GULHeartbeatDateStorable <NSObject>
+
+/**
+ * Reads the date from the specified file for the given tag.
+ * @return Returns date if exists, otherwise `nil`.
+ */
+- (nullable NSDate *)heartbeatDateForTag:(NSString *)tag;
+
+/**
+ * Saves the date for the specified tag in the specified file.
+ * @return YES on success, NO otherwise.
+ */
+- (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h b/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h
index 69623a6..245b1a2 100644
--- a/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h
+++ b/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h
@@ -16,13 +16,15 @@
 
 #import <Foundation/Foundation.h>
 
+#import "GULHeartbeatDateStorable.h"
+
 NS_ASSUME_NONNULL_BEGIN
 
 /// The name of the directory where the heartbeat data is stored.
 extern NSString *const kGULHeartbeatStorageDirectory;
 
 /// Stores either a date or a dictionary to a specified file.
-@interface GULHeartbeatDateStorage : NSObject
+@interface GULHeartbeatDateStorage : NSObject <GULHeartbeatDateStorable>
 
 - (instancetype)init NS_UNAVAILABLE;
 
diff --git a/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorageUserDefaults.h b/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorageUserDefaults.h
new file mode 100644
index 0000000..e6c7dda
--- /dev/null
+++ b/GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorageUserDefaults.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <Foundation/Foundation.h>
+
+#import "GULHeartbeatDateStorable.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Stores either a date or a dictionary to a specified file.
+@interface GULHeartbeatDateStorageUserDefaults : NSObject <GULHeartbeatDateStorable>
+
+/**
+ * Default initializer. tvOS can only write to the cache directory and
+ * there are no guarantees that the directory will persist. User defaults will
+ * be retained, so that should be used instead.
+ * @param defaults User defaults instance to store the heartbeat information.
+ * @param key The key to be used with the user defaults instance.
+ */
+- (instancetype)initWithDefaults:(NSUserDefaults *)defaults key:(NSString *)key;
+
+- (instancetype)init NS_UNAVAILABLE;
+
+/**
+ * Reads the date from the specified file for the given tag.
+ * @return Returns date if exists, otherwise `nil`.
+ */
+- (nullable NSDate *)heartbeatDateForTag:(NSString *)tag;
+
+/**
+ * Saves the date for the specified tag in the specified file.
+ * @return YES on success, NO otherwise.
+ */
+- (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
index 250f4e3..ffae1dd 100644
--- a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
+++ b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
@@ -62,6 +62,10 @@ static NSString *const kTestFileName = @"GULStorageHeartbeatTest";
                  [[self.storage heartbeatDateForTag:@"fire-iid"] timeIntervalSinceReferenceDate]);
 }
 
+- (void)testConformsToHeartbeatStorableProtocol {
+  XCTAssertTrue([self.storage conformsToProtocol:@protocol(GULHeartbeatDateStorable)]);
+}
+
 #pragma mark - Private Helpers
 
 - (void)assertInitializationDoesNotAccessFileSystem {
diff --git a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageUserDefaultsTest.m b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageUserDefaultsTest.m
new file mode 100644
index 0000000..682d4ba
--- /dev/null
+++ b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageUserDefaultsTest.m
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#import <XCTest/XCTest.h>
+#import "GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorageUserDefaults.h"
+
+@interface GULHeartbeatDateStorageUserDefaultsTest : XCTestCase
+@property(nonatomic) GULHeartbeatDateStorageUserDefaults *storage;
+@property(nonatomic) NSUserDefaults *defaults;
+@end
+
+@implementation GULHeartbeatDateStorageUserDefaultsTest
+
+- (void)setUp {
+  NSString *suiteName = [self userDefaultsSuiteName];
+  self.defaults = [[NSUserDefaults alloc] initWithSuiteName:suiteName];
+  self.storage = [[GULHeartbeatDateStorageUserDefaults alloc] initWithDefaults:self.defaults
+                                                                           key:@"test_root"];
+}
+
+- (void)tearDown {
+  [self.defaults removePersistentDomainForName:[self userDefaultsSuiteName]];
+  self.defaults = nil;
+}
+
+- (void)testHeartbeatDateForTag {
+  NSDate *now = [NSDate date];
+  [self.storage setHearbeatDate:now forTag:@"fire-iid"];
+  XCTAssertEqual([now timeIntervalSinceReferenceDate],
+                 [[self.storage heartbeatDateForTag:@"fire-iid"] timeIntervalSinceReferenceDate]);
+}
+
+- (void)testConformsToHeartbeatStorableProtocol {
+  XCTAssertTrue([self.storage conformsToProtocol:@protocol(GULHeartbeatDateStorable)]);
+}
+
+#pragma mark - Private Helpers
+
+- (NSString *)userDefaultsSuiteName {
+  NSCharacterSet *lettersToTrim = [[NSCharacterSet letterCharacterSet] invertedSet];
+  NSString *nameWithSpaces = [self.name stringByTrimmingCharactersInSet:lettersToTrim];
+  return [nameWithSpaces stringByReplacingOccurrencesOfString:@" " withString:@"_"];
+}
+
+@end

From 8b072e67590759b16ddaea74b8479388678dc2dc Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 13 Apr 2021 17:15:09 -0400
Subject: [PATCH 13/33] Update README.md (#24)

* Update README.md

* Update README.md

* Update README.md

* Adjust bullet alignment
---
 README.md | 37 ++++++++++++++++++++++++-------------
 1 file changed, 24 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 3287d2c..9b6951e 100644
--- a/README.md
+++ b/README.md
@@ -16,19 +16,30 @@ These instructions apply to minor and patch version updates. Major versions need
 a customized adaptation.
 
 After the CI is green:
-  * Update the version in the podspec to match the latest entry in the [CHANGELOG.md](CHANGELOG.md)
-  * Add the CocoaPods tag
-    * Checkout the `main` branch.
-    * `git tag CocoaPods-{version}`
-    * `git push origin CocoaPods-{version}`
-  * Push the podspec to SpecsStaging
-    * `pod repo push --skip-tests staging GoogleUtilities.podspec`
-
-    If the command fails with `Unable to find the 'staging' repo.`, add the staging repo with:
-    * `pod repo add staging https://github.com/firebase/SpecsStaging.git`
-  * Run Firebase CI by waiting until next nightly or adding a PR that touches `Gemfile`
-  * On google3, copybara and run a global TAP
-    * `third_party/firebase/ios/Releases/run_copy_bara.py --directory GoogleUtilities`
+* Update the version in the podspec to match the latest entry in the [CHANGELOG.md](CHANGELOG.md)
+* Checkout the `main` branch and ensure it is up to date.
+  ```console
+  git checkout main
+  git pull
+  ```
+* Add the CocoaPods tag (`{version}` will be the latest version in the [podspec](GoogleUtilities.podspec#L3))
+  ```console
+  git tag CocoaPods-{version}
+  git push origin CocoaPods-{version}
+  ```
+* Push the podspec to SpecsStaging
+  ```console
+  pod repo push --skip-tests staging GoogleUtilities.podspec
+  ```
+  If the command fails with `Unable to find the 'staging' repo.`, add the staging repo with:
+  ```console
+  pod repo add staging https://github.com/firebase/SpecsStaging.git
+  ```
+* Run Firebase CI by waiting until next nightly or adding a PR that touches `Gemfile`.
+* On google3, copybara and run a global TAP
+  ```console
+  third_party/firebase/ios/Releases/run_copy_bara.py --directory GoogleUtilities
+  ```
 
 ## Publishing
   * Add a version tag for Swift PM

From 1d7b81e9f3ad20f6bf66d719d8eb8dd0096d4d8c Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 13 Apr 2021 17:46:41 -0400
Subject: [PATCH 14/33] Update README.md (#25)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9b6951e..2df6d58 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ After the CI is green:
   ```
   If the command fails with `Unable to find the 'staging' repo.`, add the staging repo with:
   ```console
-  pod repo add staging https://github.com/firebase/SpecsStaging.git
+  pod repo add staging git@github.com:firebase/SpecsStaging.git
   ```
 * Run Firebase CI by waiting until next nightly or adding a PR that touches `Gemfile`.
 * On google3, copybara and run a global TAP

From a59fd0181d8f7c2b4c815cd6cddf4c38a4ba35ee Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 13 Apr 2021 18:58:54 -0400
Subject: [PATCH 15/33] Add branch param to copybara command in README (#26)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2df6d58..95acae4 100644
--- a/README.md
+++ b/README.md
@@ -38,7 +38,7 @@ After the CI is green:
 * Run Firebase CI by waiting until next nightly or adding a PR that touches `Gemfile`.
 * On google3, copybara and run a global TAP
   ```console
-  third_party/firebase/ios/Releases/run_copy_bara.py --directory GoogleUtilities
+  third_party/firebase/ios/Releases/run_copy_bara.py --directory GoogleUtilities  --branch main
   ```
 
 ## Publishing

From 51aad0ef22bbdf1e7cb6448dd216349d89e3770b Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Wed, 14 Apr 2021 10:52:28 +1000
Subject: [PATCH 16/33] chore: fix spelling (#27)

---
 CHANGELOG.md                                     |  2 +-
 .../SwizzlerTestHelpers/GULSwizzlingCache.h      |  2 +-
 .../GULSwizzlingCache_Private.h                  |  2 +-
 .../Unit/Network/third_party/GTMHTTPServer.h     |  4 ++--
 .../Unit/Swizzler/GULAppDelegateSwizzlerTest.m   | 16 ++++++++--------
 .../GULSwizzlerInheritedMethodsSwizzlingTest.m   |  2 +-
 .../Tests/Unit/Swizzler/GULSwizzlerTest.m        |  2 +-
 .../Tests/Unit/Swizzler/GULSwizzlingCacheTest.m  |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 73215a0..b34e059 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -95,7 +95,7 @@
 # 6.0.0
 - GULAppDelegateSwizzler - proxy APNS methods separately. (#2835)
 - Cocoapods 1.7.0 multiproject support. (#2751)
-- Bump minimium iOS version to iOS 8. (#2876)
+- Bump minimum iOS version to iOS 8. (#2876)
 
 # 5.7.0
 - Restore to 5.5.0 tag after increased App Store warnings. (#2807)
diff --git a/GoogleUtilities/SwizzlerTestHelpers/GULSwizzlingCache.h b/GoogleUtilities/SwizzlerTestHelpers/GULSwizzlingCache.h
index 552c58f..9e51b88 100644
--- a/GoogleUtilities/SwizzlerTestHelpers/GULSwizzlingCache.h
+++ b/GoogleUtilities/SwizzlerTestHelpers/GULSwizzlingCache.h
@@ -16,7 +16,7 @@
 
 #import <Foundation/Foundation.h>
 
-/** This class handles the caching and retreival of IMPs as we swizzle and unswizzle them. It uses
+/** This class handles the caching and retrieval of IMPs as we swizzle and unswizzle them. It uses
  *  two C++ STL unordered_maps as the underlying data store. This class is NOT thread safe.
  */
 @interface GULSwizzlingCache : NSObject
diff --git a/GoogleUtilities/SwizzlerTestHelpers/GULSwizzlingCache_Private.h b/GoogleUtilities/SwizzlerTestHelpers/GULSwizzlingCache_Private.h
index 0f2269b..245dfeb 100644
--- a/GoogleUtilities/SwizzlerTestHelpers/GULSwizzlingCache_Private.h
+++ b/GoogleUtilities/SwizzlerTestHelpers/GULSwizzlingCache_Private.h
@@ -18,7 +18,7 @@
 
 /** Checks if we've swizzled the currentIMP and returns the original IMP that would be invoked if
  *  we hadn't swizzled it in the first place. This method is private because consumers don't need it
- *  to cache or retrive any IMPs. It is used internally and for certain asserts in GULSwizzler.
+ *  to cache or retrieve any IMPs. It is used internally and for certain asserts in GULSwizzler.
  *
  *  @param currentIMP The IMP returned by class_getMethodImplementation.
  *  @return The original IMP that would be invoked if we hadn't swizzled at all, and in cases where
diff --git a/GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h b/GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h
index cc51207..11e2a1c 100644
--- a/GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h
+++ b/GoogleUtilities/Tests/Unit/Network/third_party/GTMHTTPServer.h
@@ -62,7 +62,7 @@
 #import <CFNetwork/CFNetwork.h>
 #endif  // GTM_IPHONE_SDK
 
-// Global contants needed for errors from start
+// Global constants needed for errors from start
 
 #undef _EXTERN
 #undef _INITIALIZE_AS
@@ -87,7 +87,7 @@ enum {
 
 // ----------------------------------------------------------------------------
 
-// See comment at top of file for the intened use of this class.
+// See comment at top of file for the intended use of this class.
 @interface GTMHTTPServer : NSObject {
  @private
   id delegate_;  // WEAK
diff --git a/GoogleUtilities/Tests/Unit/Swizzler/GULAppDelegateSwizzlerTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULAppDelegateSwizzlerTest.m
index 67d18ca..03e763a 100644
--- a/GoogleUtilities/Tests/Unit/Swizzler/GULAppDelegateSwizzlerTest.m
+++ b/GoogleUtilities/Tests/Unit/Swizzler/GULAppDelegateSwizzlerTest.m
@@ -562,7 +562,7 @@ static BOOL gRespondsToHandleBackgroundSession;
   XCTAssertEqualObjects(descriptionAfter, descriptionString);
 }
 
-/** Tests that methods that are not overriden by the App Delegate Proxy still work as expected. */
+/** Tests that methods that are not overridden by the App Delegate Proxy still work as expected. */
 - (void)testNotOverriddenMethods {
   GULTestAppDelegate *realAppDelegate = [[GULTestAppDelegate alloc] init];
   OCMStub([self.mockSharedApplication delegate]).andReturn(realAppDelegate);
@@ -587,7 +587,7 @@ static BOOL gRespondsToHandleBackgroundSession;
  *  handles it correctly.
  */
 - (void)testAppDelegateInstance {
-  // The test logic involves using KVC on the UIApplication.delegate propery. This does not really
+  // The test logic involves using KVC on the UIApplication.delegate property. This does not really
   // work well with OCMPartialMock([GULApplication sharedApplication]) and triggers issue
   // https://github.com/erikdoe/ocmock/issues/346.
   // Let's stop mocking the shared application for this particular test.
@@ -776,12 +776,12 @@ static BOOL gRespondsToHandleBackgroundSession;
   [GULAppDelegateSwizzler proxyOriginalDelegate];
   NSUserActivity *testUserActivity = [[NSUserActivity alloc] initWithActivityType:@"test"];
 
-  BOOL shouldContinueUserActvitiy = [testAppDelegate application:[GULApplication sharedApplication]
+  BOOL shouldContinueUserActivity = [testAppDelegate application:[GULApplication sharedApplication]
                                             continueUserActivity:testUserActivity
                                               restorationHandler:^(NSArray *restorableObjects){
                                               }];
   // Verify that it is NO when there are no interceptors.
-  XCTAssertFalse(shouldContinueUserActvitiy);
+  XCTAssertFalse(shouldContinueUserActivity);
 
   id interceptor = OCMProtocolMock(@protocol(GULApplicationDelegate));
   OCMExpect([interceptor application:OCMOCK_ANY
@@ -789,12 +789,12 @@ static BOOL gRespondsToHandleBackgroundSession;
                   restorationHandler:OCMOCK_ANY])
       .andReturn(NO);
   [GULAppDelegateSwizzler registerAppDelegateInterceptor:interceptor];
-  shouldContinueUserActvitiy = [testAppDelegate application:[GULApplication sharedApplication]
+  shouldContinueUserActivity = [testAppDelegate application:[GULApplication sharedApplication]
                                        continueUserActivity:testUserActivity
                                          restorationHandler:^(NSArray *restorableObjects){
                                          }];
   // Verify that it is NO when the only interceptor returns a NO.
-  XCTAssertFalse(shouldContinueUserActvitiy);
+  XCTAssertFalse(shouldContinueUserActivity);
 
   id interceptor2 = OCMProtocolMock(@protocol(GULApplicationDelegate));
   OCMExpect([interceptor2 application:OCMOCK_ANY
@@ -807,13 +807,13 @@ static BOOL gRespondsToHandleBackgroundSession;
                 continueUserActivity:OCMOCK_ANY
                   restorationHandler:OCMOCK_ANY])
       .andReturn(NO);
-  shouldContinueUserActvitiy = [testAppDelegate application:[GULApplication sharedApplication]
+  shouldContinueUserActivity = [testAppDelegate application:[GULApplication sharedApplication]
                                        continueUserActivity:testUserActivity
                                          restorationHandler:^(NSArray *restorableObjects){
                                          }];
 
   // The result is YES if one of the interceptors returns YES.
-  XCTAssertTrue(shouldContinueUserActvitiy);
+  XCTAssertTrue(shouldContinueUserActivity);
 }
 
 - (void)testApplicationDidRegisterForRemoteNotificationsIsInvokedOnInterceptors {
diff --git a/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerInheritedMethodsSwizzlingTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerInheritedMethodsSwizzlingTest.m
index b2ba248..5d171fe 100644
--- a/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerInheritedMethodsSwizzlingTest.m
+++ b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerInheritedMethodsSwizzlingTest.m
@@ -126,7 +126,7 @@
 
   SEL swizzledSelector = @selector(description);
 
-  // Observe that swizzling the superclass IMP propogates to its subclasses when we haven't yet
+  // Observe that swizzling the superclass IMP propagates to its subclasses when we haven't yet
   // swizzled and unsiwzzled the subclasses.
   [GULSwizzler swizzleClass:[PollutedTestObject class]
                    selector:swizzledSelector
diff --git a/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerTest.m
index a285109..f46c05f 100644
--- a/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerTest.m
+++ b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlerTest.m
@@ -410,7 +410,7 @@
                                                     selector:testSelector2
                                              isClassSelector:NO];
   XCTAssertNotEqual(origImp2, NULL, @"Original IMP is NULL after swizzle.");
-  XCTAssertNotEqual(origImp, origImp2, @"Implementations are the same when they should't be.");
+  XCTAssertNotEqual(origImp, origImp2, @"Implementations are the same when they shouldn't be.");
 
   [GULSwizzler unswizzleClass:testClass selector:testSelector isClassSelector:NO];
   [GULSwizzler unswizzleClass:testClass2 selector:testSelector2 isClassSelector:NO];
diff --git a/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlingCacheTest.m b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlingCacheTest.m
index 3dcd001..34f606f 100644
--- a/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlingCacheTest.m
+++ b/GoogleUtilities/Tests/Unit/Swizzler/GULSwizzlingCacheTest.m
@@ -149,7 +149,7 @@
   XCTAssert([[GULSwizzlingCache sharedInstance] cachedIMPForClass:swizzledClass
                                                      withSelector:swizzledSelector] != NULL);
   XCTAssertEqual([GULSwizzlingCache originalIMPOfCurrentIMP:newIMP], originalIMP,
-                 @"New to original IMP cache was not correctly poplated.");
+                 @"New to original IMP cache was not correctly populated.");
 
   [[GULSwizzlingCache sharedInstance] clearCacheForSwizzledIMP:newIMP
                                                       selector:swizzledSelector

From be782e8c44d8d40f22f915e876bf1392fd9ef6d6 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Thu, 15 Apr 2021 10:18:46 -0400
Subject: [PATCH 17/33] Update README.md (#28)

---
 README.md | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 95acae4..b7e9be1 100644
--- a/README.md
+++ b/README.md
@@ -27,18 +27,37 @@ After the CI is green:
   git tag CocoaPods-{version}
   git push origin CocoaPods-{version}
   ```
-* Push the podspec to SpecsStaging
-  ```console
-  pod repo push --skip-tests staging GoogleUtilities.podspec
-  ```
-  If the command fails with `Unable to find the 'staging' repo.`, add the staging repo with:
-  ```console
-  pod repo add staging git@github.com:firebase/SpecsStaging.git
-  ```
+* Push the podspec to the designated repo
+  * If this version of GoogleUtilities is intended to launch **before or with** the next Firebase release:
+    <details>
+    <summary>Push to <b>SpecsStaging</b></summary>
+
+    ```console
+    pod repo push --skip-tests staging GoogleUtilities.podspec
+    ```
+
+    If the command fails with `Unable to find the 'staging' repo.`, add the staging repo with:
+    ```console
+    pod repo add staging git@github.com:firebase/SpecsStaging.git
+    ```
+    </details>
+  * Otherwise:
+    <details>
+    <summary>Push to <b>SpecsDev</b></summary>
+
+    ```console
+    pod repo push --skip-tests dev GoogleUtilities.podspec
+    ```
+
+    If the command fails with `Unable to find the 'dev' repo.`, add the dev repo with:
+    ```console
+    pod repo add dev git@github.com:firebase/SpecsDev.git
+    ```
+    </details>
 * Run Firebase CI by waiting until next nightly or adding a PR that touches `Gemfile`.
-* On google3, copybara and run a global TAP
+* On google3, create a workspace. Then copybara and run a global TAP.
   ```console
-  third_party/firebase/ios/Releases/run_copy_bara.py --directory GoogleUtilities  --branch main
+  third_party/firebase/ios/Releases/run_copy_bara.py --directory GoogleUtilities --branch main
   ```
 
 ## Publishing

From 8ab4e9d65bd65724e8d94db762e19581df5be58e Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 20 Apr 2021 14:12:55 -0400
Subject: [PATCH 18/33] Revert heartbeat storage directory name (#29)

---
 GoogleUtilities/Environment/GULHeartbeatDateStorage.m | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
index affdf76..df40958 100644
--- a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
+++ b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
@@ -17,7 +17,7 @@
 #import "GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h"
 #import "GoogleUtilities/Environment/Public/GoogleUtilities/GULSecureCoding.h"
 
-NSString *const kGULHeartbeatStorageDirectory = @"GoogleHeartbeatStorage";
+NSString *const kGULHeartbeatStorageDirectory = @"Google/FIRApp";
 
 @interface GULHeartbeatDateStorage ()
 /** The storage to store the date of the last sent heartbeat. */
@@ -63,7 +63,7 @@ NSString *const kGULHeartbeatStorageDirectory = @"GoogleHeartbeatStorage";
 #else
   paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
 #endif  // TARGET_OS_TV
-  NSString *rootPath = [paths firstObject];
+  NSString *rootPath = [paths lastObject];
   NSURL *rootURL = [NSURL fileURLWithPath:rootPath];
   NSURL *directoryURL = [rootURL URLByAppendingPathComponent:kGULHeartbeatStorageDirectory];
   return directoryURL;

From 77c22ad69cff470696cbd892f20322c7e9f1932c Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 20 Apr 2021 15:47:59 -0400
Subject: [PATCH 19/33] Update repo for clang-format12 (#30)

* Update check.yml to use clang-format12

* Update README.md

* Style repo for clang-format12
---
 .github/workflows/check.yml                  | 2 +-
 GoogleUtilities/MethodSwizzler/GULSwizzler.m | 2 +-
 README.md                                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 7ff802f..f32d2f7 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -30,7 +30,7 @@ jobs:
     - name: Setup check
       run: |
         brew update
-        brew install clang-format@11
+        brew install clang-format@12
         brew install mint
         mint bootstrap
 
diff --git a/GoogleUtilities/MethodSwizzler/GULSwizzler.m b/GoogleUtilities/MethodSwizzler/GULSwizzler.m
index 6b17408..7f0c82e 100644
--- a/GoogleUtilities/MethodSwizzler/GULSwizzler.m
+++ b/GoogleUtilities/MethodSwizzler/GULSwizzler.m
@@ -65,7 +65,7 @@ dispatch_queue_t GetGULSwizzlingQueue(void) {
         [inv setArgument:&(currentImp) atIndex:2];
         [inv setArgument:&(newImp) atIndex:3];
         [inv setArgument:&(resolvedClass) atIndex:4];
-        [inv setArgument:(void *_Nonnull) & (selector) atIndex:5];
+        [inv setArgument:(void *_Nonnull)&(selector) atIndex:5];
         [inv invoke];
       }
     }
diff --git a/README.md b/README.md
index b7e9be1..3f46ff8 100644
--- a/README.md
+++ b/README.md
@@ -111,7 +111,7 @@ GitHub Actions will verify that any code changes are done in a style compliant
 way. Install `clang-format` and `mint`:
 
 ```console
-brew install clang-format@11
+brew install clang-format@12
 brew install mint
 ```
 

From b559d64b0b2063c65e7a980b5260694d0716f2c2 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 20 Apr 2021 15:53:32 -0400
Subject: [PATCH 20/33] Delete  GoogleUtilities/README.md (#31)

---
 GoogleUtilities/README.md | 39 ---------------------------------------
 1 file changed, 39 deletions(-)
 delete mode 100644 GoogleUtilities/README.md

diff --git a/GoogleUtilities/README.md b/GoogleUtilities/README.md
deleted file mode 100644
index 75efe77..0000000
--- a/GoogleUtilities/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Google Utilities
-
-## Overview
-
-The GoogleUtilities pod is a set of utilities organized into CocoaPods subspecs.
-See the [podspec](../GoogleUtilities.podspec) for a summary of what utilities
-are currently included. They're used by Firebase and other Google products.
-
-Direct usage by non-Google products and CocoaPods is **NOT** currently
-recommended or supported in general.
-
-**However**, we do specifically recommend that non-Google SDKs can use the App Delegate Swizzler to hook into app delegate methods as this reduces conflicts with multiple SDKs trying to do the same.
-
-Instructions on how to adopt the app delegate swizzler for use by your SDK are available [here](./AppDelegateSwizzler/README.md).
-
-## Development
-
-Follow the subsequent instructions to develop, debug, unit test, and
-integration test FirebaseFunctions:
-
-### Prereqs
-
-- At least CocoaPods 1.7.0
-
-### To Develop
-
-- Run `pod gen GoogleUtilities.podspec`
-- `open gen/GoogleUtilities/GoogleUtilities.xcworkspace`
-
-OR these two commands can be combined with
-
-- `pod gen GoogleUtilities.podspec --auto-open --gen-directory="gen" --clean`
-
-You're now in an Xcode workspace generate for building, debugging and
-testing the GoogleUtilities CocoaPod.
-
-### Running Unit Tests
-
-Choose the one of the Tests* schemes and press Command-u.

From e3c98a35df0ee9d87a4b33fa1b814691b22b1dca Mon Sep 17 00:00:00 2001
From: Paul Beusterien <paulbeusterien@google.com>
Date: Wed, 21 Apr 2021 12:31:31 -0700
Subject: [PATCH 21/33] Support iOS 9 with SwiftPM (#32)

---
 CHANGELOG.md  | 1 +
 Package.swift | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b34e059..e4b9279 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # 7.4.0
 - Change heartbeat directory name and refactor file. (#19)
 - Introduce user defaults based heartbeat storage. (#23)
+- Support iOS 9 with Swift Package Manager.
 
 # 7.3.1
 - Add explicit dependency on Security framework to Environment subspec. (#12)
diff --git a/Package.swift b/Package.swift
index 28c22f7..6da16a8 100644
--- a/Package.swift
+++ b/Package.swift
@@ -19,7 +19,7 @@ import PackageDescription
 
 let package = Package(
   name: "GoogleUtilities",
-  platforms: [.iOS(.v10), .macOS(.v10_12), .tvOS(.v10), .watchOS(.v6)],
+  platforms: [.iOS(.v9), .macOS(.v10_12), .tvOS(.v10), .watchOS(.v6)],
   products: [
     .library(
       name: "GULAppDelegateSwizzler",

From 66f5945ac3a4c4ac268bf94c31f226116b14e327 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Mon, 26 Apr 2021 16:19:26 -0400
Subject: [PATCH 22/33] Add tests for heartbeat APIs before releasing GULs 7.4
 (#34)

* Add tests for heartbeat APIs

* Remove failing tests
---
 .../Environment/GULHeartbeatDateStorage.m     |  40 +--
 .../GULHeartbeatDateStorageUserDefaults.m     |   2 +-
 .../Environment/GULHeartbeatDateStorageTest.m | 256 +++++++++++++++---
 .../GULHeartbeatDateStorageUserDefaultsTest.m |  41 ++-
 4 files changed, 271 insertions(+), 68 deletions(-)

diff --git a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
index df40958..42cc059 100644
--- a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
+++ b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
@@ -91,26 +91,6 @@ NSString *const kGULHeartbeatStorageDirectory = @"Google/FIRApp";
                       }];
 }
 
-- (nullable NSDictionary *)heartbeatDictionaryWithFileURL:(NSURL *)readingFileURL {
-  NSDictionary *heartbeatDictionary;
-
-  NSError *error;
-  NSData *objectData = [NSData dataWithContentsOfURL:readingFileURL options:0 error:&error];
-
-  if (objectData.length > 0 && error == nil) {
-    NSSet<Class> *objectClasses = [NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]];
-    heartbeatDictionary = [GULSecureCoding unarchivedObjectOfClasses:objectClasses
-                                                            fromData:objectData
-                                                               error:&error];
-  }
-
-  if (heartbeatDictionary.count == 0 || error != nil) {
-    heartbeatDictionary = [NSDictionary dictionary];
-  }
-
-  return heartbeatDictionary;
-}
-
 - (nullable NSDate *)heartbeatDateForTag:(NSString *)tag {
   __block NSDictionary *heartbeatDictionary;
   NSError *error;
@@ -145,6 +125,26 @@ NSString *const kGULHeartbeatStorageDirectory = @"Google/FIRApp";
   return isSuccess;
 }
 
+- (NSDictionary *)heartbeatDictionaryWithFileURL:(NSURL *)readingFileURL {
+  NSDictionary *heartbeatDictionary;
+
+  NSError *error;
+  NSData *objectData = [NSData dataWithContentsOfURL:readingFileURL options:0 error:&error];
+
+  if (objectData.length > 0 && error == nil) {
+    NSSet<Class> *objectClasses = [NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]];
+    heartbeatDictionary = [GULSecureCoding unarchivedObjectOfClasses:objectClasses
+                                                            fromData:objectData
+                                                               error:&error];
+  }
+
+  if (heartbeatDictionary.count == 0 || error != nil) {
+    heartbeatDictionary = [NSDictionary dictionary];
+  }
+
+  return heartbeatDictionary;
+}
+
 - (BOOL)writeDictionary:(NSDictionary *)dictionary
           forWritingURL:(NSURL *)writingFileURL
                   error:(NSError **)outError {
diff --git a/GoogleUtilities/Environment/GULHeartbeatDateStorageUserDefaults.m b/GoogleUtilities/Environment/GULHeartbeatDateStorageUserDefaults.m
index 604f866..f8f1159 100644
--- a/GoogleUtilities/Environment/GULHeartbeatDateStorageUserDefaults.m
+++ b/GoogleUtilities/Environment/GULHeartbeatDateStorageUserDefaults.m
@@ -37,7 +37,7 @@
   return self;
 }
 
-- (nullable NSMutableDictionary *)heartbeatDictionaryFromDefaults {
+- (NSMutableDictionary *)heartbeatDictionaryFromDefaults {
   NSDictionary *heartbeatDict = [self.userDefaults objectForKey:self.key];
   if (heartbeatDict != nil) {
     return [heartbeatDict mutableCopy];
diff --git a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
index ffae1dd..9603ad2 100644
--- a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
+++ b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
@@ -16,78 +16,250 @@
 
 #import <XCTest/XCTest.h>
 #import "GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h"
+#import "GoogleUtilities/Environment/Public/GoogleUtilities/GULSecureCoding.h"
 
 @interface GULHeartbeatDateStorageTest : XCTestCase
 @property(nonatomic) GULHeartbeatDateStorage *storage;
 @end
 
-static NSString *const kTestFileName = @"GULStorageHeartbeatTest";
+static NSString *const kTestFileName = @"GULStorageHeartbeatTestFile";
 
-@implementation GULHeartbeatDateStorageTest
+@implementation GULHeartbeatDateStorageTest {
+  BOOL _rootDirectoryCreated;
+}
 
-- (void)setUp {
-#if TARGET_OS_TV
-  NSArray *path = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
-#else
-  NSArray *path =
-      NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
-#endif
-  NSString *rootPath = [path firstObject];
-  XCTAssertNotNil(rootPath);
-  NSURL *rootURL = [NSURL fileURLWithPath:rootPath];
+- (BOOL)setUpWithError:(NSError *__autoreleasing _Nullable *)error {
+  [super setUpWithError:error];
 
-  NSError *error;
-  if (![rootURL checkResourceIsReachableAndReturnError:&error]) {
-    XCTAssert([[NSFileManager defaultManager] createDirectoryAtURL:rootURL
-                                       withIntermediateDirectories:YES
-                                                        attributes:nil
-                                                             error:&error],
-              @"Error: %@", error);
+  NSError *directoryError;
+  if (!_rootDirectoryCreated) {
+    _rootDirectoryCreated = [self createRootDirectoryWithError:&directoryError];
   }
 
-  self.storage = [[GULHeartbeatDateStorage alloc] initWithFileName:kTestFileName];
+  BOOL success = _rootDirectoryCreated;
+  if (!success && error) {
+    *error = [NSError errorWithDomain:@"com.GULHeartbeatDateStorageTest.ErrorDomain"
+                                 code:1
+                             userInfo:@{NSUnderlyingErrorKey : directoryError}];
+  }
 
+  return success;
+}
+
+- (void)setUp {
+  [super setUp];
+
+  self.storage = [[GULHeartbeatDateStorage alloc] initWithFileName:kTestFileName];
   [self assertInitializationDoesNotAccessFileSystem];
 }
 
 - (void)tearDown {
-  [[NSFileManager defaultManager] removeItemAtURL:[self.storage fileURL] error:nil];
+  [super tearDown];
+
+  // Removes the Heartbeat Storage Directory if it exists.
+  NSURL *directoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
+  [[NSFileManager defaultManager] removeItemAtURL:directoryURL error:nil];
+
   self.storage = nil;
 }
 
+#pragma mark - Public API Tests
+
 - (void)testHeartbeatDateForTag {
-  NSDate *now = [NSDate date];
-  [self.storage setHearbeatDate:now forTag:@"fire-iid"];
-  XCTAssertEqual([now timeIntervalSinceReferenceDate],
-                 [[self.storage heartbeatDateForTag:@"fire-iid"] timeIntervalSinceReferenceDate]);
+  // 1. Tags and saves heartbeat info, which creates the storage directory & file as side effects.
+  NSDate *date = [NSDate date];
+  NSString *tag = @"tag";
+  BOOL successfulSave = [self.storage setHearbeatDate:date forTag:tag];
+  XCTAssert(successfulSave);
+
+  // 2. Retrieve saved heartbeat info.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:tag];
+
+  // 3. Assert that requested heartbeat info matches what was stored.
+  //    This implies the storage directory & file were created, written to, and read from.
+  XCTAssertEqualObjects(retrievedDate, date);
+}
+
+/// Heartbeat info is requested when the storage directory already exists (i.e. it was created in a
+/// previous app launch).
+- (void)testHeartbeatDateForTagWhenHeartbeatStorageDirectoryExists {
+  // 1. Manually create the heartbeat directory.
+  NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
+  NSError *error;
+  BOOL directoryCreated = [self explicitlyCreateDirectoryForURL:heartbeatStorageDirectoryURL
+                                                      withError:&error];
+  XCTAssert(directoryCreated);
+
+  // 2. Populate the storage file with heartbeat info.
+  // 2.1 Create a dictionary with heartbeat info.
+  NSDate *storedDate = [NSDate dateWithTimeIntervalSince1970:0];
+  NSString *storedTag = @"stored-tag";
+  NSDictionary *storedHeartbeatDictionary = @{storedTag : storedDate};
+  // 2.2 Encode the dictionary.
+  NSError *archiveError;
+  NSData *data = [GULSecureCoding archivedDataWithRootObject:storedHeartbeatDictionary
+                                                       error:&archiveError];
+  XCTAssertNotNil(data);
+  XCTAssertNil(archiveError);
+
+  // 2.3 Write the encoded dictionary to file.
+  NSURL *heartbeatStorageFileURL = [self fileURLForDirectory:heartbeatStorageDirectoryURL];
+  [data writeToURL:heartbeatStorageFileURL atomically:YES];
+  XCTAssertNotNil(data);
+
+  // 3. Retrieve the stored heartbeat info and validate that it matches the info that was stored.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:storedTag];
+
+  XCTAssertEqualObjects(retrievedDate, storedDate);
+}
+
+- (void)testHeartbeatDateForTagWhenReturnedDateIsNil {
+  NSString *nonexistentTag = @"missing-tag";
+  NSDate *nilDate = [self.storage heartbeatDateForTag:nonexistentTag];
+  XCTAssertNil(nilDate);
+}
+
+- (void)testSetHeartbeatDateForTagWhenExpectingFailure {
+  // The `setHearbeatDate: forTag:` API is expected to return NO if it is unable to write the
+  // heartbeat info to file. To verify the API successfully fails, an invalid string is used to
+  // create an invalid instance of `GULHeartbeatDateStorage` by supplying an invalid filename.
+  // This replicates a file system error that prohibits `setHearbeatDate: forTag:` from successfully
+  // storing the heartbeat info.
+  NSString *invalidFileName = @"";
+  GULHeartbeatDateStorage *invalidStorage =
+      [[GULHeartbeatDateStorage alloc] initWithFileName:invalidFileName];
+
+  BOOL success = [invalidStorage setHearbeatDate:NSDate.date forTag:@"tag"];
+  XCTAssertFalse(success);
+}
+
+- (void)testSetHeartbeatDateForTag {
+  NSDate *date = [NSDate date];
+  NSString *tag = @"tag";
+
+  // 1. Retrieve heartbeat info that is not stored and assert the retrieved info is nil.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertNil(retrievedDate);
+
+  // 2. Save the heartbeat info and assert the save was successful.
+  BOOL successfulSave = [self.storage setHearbeatDate:date forTag:tag];
+  XCTAssert(successfulSave);
+
+  // 3. Retrieve heartbeat info that is now stored and assert the retrieved info is accurate.
+  retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertEqualObjects(retrievedDate, date);
+}
+
+- (void)testHeartbeatDateForTagWhenHeartbeatFileReturnsInvalidData {
+  // 1. Manually create the heartbeat directory.
+  NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
+  NSError *error;
+  BOOL directoryCreated = [self explicitlyCreateDirectoryForURL:heartbeatStorageDirectoryURL
+                                                      withError:&error];
+  XCTAssert(directoryCreated);
+
+  // 2. Populate the storage file with invalid data.
+  NSData *corruptedData = [@"abc" dataUsingEncoding:NSUTF8StringEncoding];
+  XCTAssertNotNil(corruptedData);
+  NSURL *heartbeatStorageFileURL = [self fileURLForDirectory:heartbeatStorageDirectoryURL];
+  [corruptedData writeToURL:heartbeatStorageFileURL atomically:YES];
+
+  // 3. Retrieve saved heartbeat info and assert that it is nil.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:@"tag"];
+  XCTAssertNil(retrievedDate);
+}
+
+- (void)testSetHeartbeatDateForTagWhenHeartbeatFileReturnsInvalidData {
+  // 1. Manually create the heartbeat directory.
+  NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
+  NSError *error;
+  BOOL directoryCreated = [self explicitlyCreateDirectoryForURL:heartbeatStorageDirectoryURL
+                                                      withError:&error];
+  XCTAssert(directoryCreated);
+
+  // 2. Populate the storage file with invalid data.
+  NSData *corruptedData = [@"abc" dataUsingEncoding:NSUTF8StringEncoding];
+  XCTAssertNotNil(corruptedData);
+  NSURL *heartbeatStorageFileURL = [self fileURLForDirectory:heartbeatStorageDirectoryURL];
+  [corruptedData writeToURL:heartbeatStorageFileURL atomically:YES];
+
+  // 3. Tag and save heartbeat info. This should overwrite the invalid data with a
+  //    correctly encoded heartbeat dictionary.
+  NSDate *date = [NSDate date];
+  NSString *tag = @"tag";
+  BOOL successfulSave = [self.storage setHearbeatDate:date forTag:tag];
+  XCTAssert(successfulSave);
+
+  // 4. Retrieve saved heartbeat info.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:tag];
+
+  // 5. Assert that requested heartbeat info matches what was stored.
+  //    This implies the storage directory & file were created, written to, and read from.
+  XCTAssertEqualObjects(retrievedDate, date);
 }
 
 - (void)testConformsToHeartbeatStorableProtocol {
   XCTAssertTrue([self.storage conformsToProtocol:@protocol(GULHeartbeatDateStorable)]);
 }
 
-#pragma mark - Private Helpers
+#pragma mark - Testing Utilities
 
-- (void)assertInitializationDoesNotAccessFileSystem {
-  NSURL *fileURL = [self heartbeatFileURL];
-  NSError *error;
-  BOOL fileIsReachable = [fileURL checkResourceIsReachableAndReturnError:&error];
-  XCTAssertFalse(fileIsReachable,
-                 @"GULHeartbeatDateStorage initialization should not access the file system.");
-  XCTAssertNotNil(error, @"Error: %@", error);
+- (BOOL)createRootDirectoryWithError:(NSError *__autoreleasing _Nullable *)outError {
+  NSArray<NSString *> *paths;
+#if TARGET_OS_TV
+  paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+#else
+  paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+#endif  // TARGET_OS_TV
+  NSString *rootPath = [paths lastObject];
+  NSURL *rootURL = [NSURL fileURLWithPath:rootPath];
+
+  BOOL rootDirectoryExists = [rootURL checkResourceIsReachableAndReturnError:nil];
+  if (!rootDirectoryExists) {
+    rootDirectoryExists = [[NSFileManager defaultManager] createDirectoryAtURL:rootURL
+                                                   withIntermediateDirectories:YES
+                                                                    attributes:nil
+                                                                         error:outError];
+  }
+  return rootDirectoryExists;
 }
 
-- (NSURL *)heartbeatFileURL {
+- (BOOL)explicitlyCreateDirectoryForURL:(NSURL *)directoryPathURL withError:(NSError **)outError {
+  BOOL success = false;
+  if (![directoryPathURL checkResourceIsReachableAndReturnError:outError]) {
+    success = [[NSFileManager defaultManager] createDirectoryAtURL:directoryPathURL
+                                       withIntermediateDirectories:YES
+                                                        attributes:nil
+                                                             error:outError];
+  }
+  return success;
+}
+
+- (void)assertInitializationDoesNotAccessFileSystem {
+  NSString *directoryURL = [[self pathURLForDirectory:kGULHeartbeatStorageDirectory] path];
+  BOOL isDir;
+  BOOL directoryIsReachable =
+      [[NSFileManager defaultManager] fileExistsAtPath:directoryURL isDirectory:&isDir] && isDir;
+  XCTAssertFalse(directoryIsReachable,
+                 @"The Heartbeat Storage Directory already exists. "
+                 @"GULHeartbeatDateStorage initialization should not access the file system.");
+}
+
+- (NSURL *)pathURLForDirectory:(NSString *)directory {
+  NSArray<NSString *> *paths;
 #if TARGET_OS_TV
-  NSArray *path = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+  paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
 #else
-  NSArray *path =
-      NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
-#endif
-  NSString *rootPath = [path firstObject];
-  NSArray<NSString *> *components = @[ rootPath, kGULHeartbeatStorageDirectory, kTestFileName ];
-  NSString *fileString = [NSString pathWithComponents:components];
-  NSURL *fileURL = [NSURL fileURLWithPath:fileString];
+  paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+#endif  // TARGET_OS_TV
+  NSString *rootPath = [paths lastObject];
+  NSURL *rootURL = [NSURL fileURLWithPath:rootPath];
+  NSURL *directoryURL = [rootURL URLByAppendingPathComponent:directory];
+  return directoryURL;
+}
+
+- (NSURL *)fileURLForDirectory:(NSURL *)directoryURL {
+  NSURL *fileURL = [directoryURL URLByAppendingPathComponent:kTestFileName];
   return fileURL;
 }
 
diff --git a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageUserDefaultsTest.m b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageUserDefaultsTest.m
index 682d4ba..18c13b2 100644
--- a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageUserDefaultsTest.m
+++ b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageUserDefaultsTest.m
@@ -34,20 +34,51 @@
 - (void)tearDown {
   [self.defaults removePersistentDomainForName:[self userDefaultsSuiteName]];
   self.defaults = nil;
+
+  self.storage = nil;
 }
 
+#pragma mark - Public API Tests
+
 - (void)testHeartbeatDateForTag {
-  NSDate *now = [NSDate date];
-  [self.storage setHearbeatDate:now forTag:@"fire-iid"];
-  XCTAssertEqual([now timeIntervalSinceReferenceDate],
-                 [[self.storage heartbeatDateForTag:@"fire-iid"] timeIntervalSinceReferenceDate]);
+  // 1. Tag and save some heartbeat info.
+  NSDate *storedDate = [NSDate date];
+  NSString *tag = @"fire-iid";
+  [self.storage setHearbeatDate:storedDate forTag:tag];
+
+  // 2. Retrieve the stored heartbeat info and assert the retrieved info is accurate.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertEqualObjects(retrievedDate, storedDate);
+}
+
+- (void)testHeartbeatDateForTagWhenReturnedDateIsNil {
+  NSString *nonexistentTag = @"missing-tag";
+  NSDate *nilDate = [self.storage heartbeatDateForTag:nonexistentTag];
+  XCTAssertNil(nilDate);
+}
+
+- (void)testSetHeartbeatDateForTag {
+  NSDate *date = [NSDate date];
+  NSString *tag = @"tag";
+
+  // 1. Retrieve heartbeat info that is not stored and assert the retrieved info is nil.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertNil(retrievedDate);
+
+  // 2. Save the heartbeat info and assert the save was successful.
+  BOOL successfulSave = [self.storage setHearbeatDate:date forTag:tag];
+  XCTAssert(successfulSave);
+
+  // 3. Retrieve heartbeat info that is now stored and assert the retrieved info is accurate.
+  retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertEqualObjects(retrievedDate, date);
 }
 
 - (void)testConformsToHeartbeatStorableProtocol {
   XCTAssertTrue([self.storage conformsToProtocol:@protocol(GULHeartbeatDateStorable)]);
 }
 
-#pragma mark - Private Helpers
+#pragma mark - Testing Utilities
 
 - (NSString *)userDefaultsSuiteName {
   NSCharacterSet *lettersToTrim = [[NSCharacterSet letterCharacterSet] invertedSet];

From 2124e8645fa00ff4e8c219f29e5a11aa7c5e6667 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 27 Apr 2021 17:26:07 -0400
Subject: [PATCH 23/33] README updates following 7.4.0 release (#35)

* Update README.md

* Update README.md

* Update README.md

* Fix header links

* Fix header links 2

* Remove trailing whitespaces
---
 README.md | 51 +++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 3f46ff8..3268a6c 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ a customized adaptation.
 
 After the CI is green:
 * Update the version in the podspec to match the latest entry in the [CHANGELOG.md](CHANGELOG.md)
-* Checkout the `main` branch and ensure it is up to date.
+* Checkout the `main` branch and ensure it is up to date
   ```console
   git checkout main
   git pull
@@ -55,17 +55,56 @@ After the CI is green:
     ```
     </details>
 * Run Firebase CI by waiting until next nightly or adding a PR that touches `Gemfile`.
-* On google3, create a workspace. Then copybara and run a global TAP.
+* On google3, run copybara using the command below. Then, start a global TAP on the generated CL. Deflake as needed.
   ```console
   third_party/firebase/ios/Releases/run_copy_bara.py --directory GoogleUtilities --branch main
   ```
 
 ## Publishing
+The release process is as follows:
+1. [Tag and release for Swift PM](#swift-package-manager)
+2. [Publish to CocoaPods](#cocoapods)
+3. [Perform post release cleanup](#post-release-cleanup)
+
+### Swift Package Manager
+  By creating and [pushing a tag](https://github.com/google/GoogleUtilities/tags)
+  for Swift PM, the newly tagged version will be immediately released for public use.
+  Given this, please verify the intended time of release for Swift PM.
   * Add a version tag for Swift PM
-    * `git tag {version}`
-    * `git push origin {version}`
-  * `pod trunk push GoogleUtilities.podspec`
-  * Clean up SpecsStaging
+  ```console
+  git tag {version}
+  git push origin {version}
+  ```
+  *Note: Ensure that any inflight PRs that depend on the new `GoogleUtilities` version are updated to point to the
+  newly tagged version rather than a checksum.*
+
+### CocoaPods
+* Publish the newly versioned pod to CocoaPods
+
+  It's recommended to point to the `GoogleUtilities.podspec` in `staging` to make sure the correct spec is being published.
+  ```console
+  pod trunk push ~/.cocoapods/repos/staging/GoogleUtilities/7.4.0/GoogleUtilities.podspec
+  ```
+  *Note: In some cases, it may be acceptable to `pod trunk push` with the `--skip-tests` flag. Please double check with
+  the maintainers before doing so.*
+
+  The pod push was successful if the above command logs: `🚀  GoogleUtilities ({version}) successfully published`.
+  In addition, a new commit that publishes the new version (co-authored by [CocoaPodsAtGoogle](https://github.com/CocoaPodsAtGoogle))
+  should appear in the [CocoaPods specs repo](https://github.com/CocoaPods/Specs). Last, the latest version should be displayed
+  on [GoogleUtilities's CocoaPods page](https://cocoapods.org/pods/GoogleUtilities).
+
+  *Don't forget to perform the [post release cleanup](#post-release-cleanup)!*
+
+### Post Release Cleanup
+* Clean up [SpecsStaging](https://github.com/firebase/SpecsStaging):
+  ```console
+  cd ~/path/to/SpecsStaging/
+  git checkout master
+  git pull
+  git rm -rf GoogleUtilities/
+  git commit -m "Post GoogleUtilities {version} release cleanup"
+  git push
+  ```
 
 ## Development
 

From 58359415d4ea29ebdc8fa5b41ce96c434d76d901 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Mon, 10 May 2021 20:48:57 -0400
Subject: [PATCH 24/33] Fix crashes where `setHeartbeatDate:forTag:` reads
 immutable dictionary.  (#37)

* Unsuccessful repro attempt

* Reproduced 8047 crash

* Fix hb issue related to 7.4 release

* Edit tests

* Update CHANGELOG

* Remove whitespace from CHANGELOG

* Review

* Review 2

* Update GULHeartbeatDateStorageTest.m

* Update comment

* Add tests for unexpected types

* Update podspec

* Date validation

* Add tests for issue fix and type validation

* Use bracket syntax

* Add compatibility tests

* Add compatibility tests revision

* Fix CI

* Fix CI 2

* Fix CI 3

* Re-add files through Xcode UI

* Revert "Re-add files through Xcode UI"

This reverts commit 44110e6ba9fbec0d9308af57cb8676d403a7bb01.

* Add new files to ARC files list in the test spec

* Uncomment validation failed due to disabled ARC

Co-authored-by: Maksym Malyhin <mmaksym@google.com>
---
 CHANGELOG.md                                  |   3 +
 GoogleUtilities.podspec                       |  11 +-
 .../Environment/GULHeartbeatDateStorage.m     |  14 +-
 .../Environment/GULHeartbeatDateStorageTest.m | 173 +++++++++++++++++-
 .../Sources/GULHeartbeatDateStorageV7.3.1.h   |  51 ++++++
 .../Sources/GULHeartbeatDateStorageV7.3.1.m   | 161 ++++++++++++++++
 .../Sources/GULHeartbeatDateStorageV7.4.0.h   |  55 ++++++
 .../Sources/GULHeartbeatDateStorageV7.4.0.m   | 162 ++++++++++++++++
 8 files changed, 623 insertions(+), 7 deletions(-)
 create mode 100644 GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.h
 create mode 100644 GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.m
 create mode 100644 GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.h
 create mode 100644 GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.m

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4b9279..c4b26c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 7.4.1
+- Improve heartbeat date storage's version compatability. (#37)
+
 # 7.4.0
 - Change heartbeat directory name and refactor file. (#19)
 - Introduce user defaults based heartbeat storage. (#23)
diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index 437a4e7..e10d12c 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.4.0'
+  s.version          = '7.4.1'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC
@@ -125,7 +125,7 @@ other Google CocoaPods. They're not intended for direct public usage.
 
   s.test_spec 'unit' do |unit_tests|
     unit_tests.scheme = { :code_coverage => true }
-    # All tests require arc except Tests/Network/third_party/GTMHTTPServer.m
+
     unit_tests.platforms = {
       :ios => ios_deployment_target,
       :osx => osx_deployment_target,
@@ -134,7 +134,12 @@ other Google CocoaPods. They're not intended for direct public usage.
     unit_tests.source_files = [
       'GoogleUtilities/Tests/Unit/**/*.[mh]',
     ]
-    unit_tests.requires_arc = 'GoogleUtilities/Tests/Unit/*/*.[mh]'
+
+    # All tests require arc except Tests/Network/third_party/GTMHTTPServer.m
+    unit_tests.requires_arc = [
+      'GoogleUtilities/Tests/Unit/*/*.[mh]',
+      'GoogleUtilities/Tests/Unit/Environment/**/*.[mh]'
+    ]
     unit_tests.requires_app_host = true
     unit_tests.dependency 'OCMock'
   end
diff --git a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
index 42cc059..7ac08f9 100644
--- a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
+++ b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
@@ -101,7 +101,11 @@ NSString *const kGULHeartbeatStorageDirectory = @"Google/FIRApp";
                                           heartbeatDictionary =
                                               [self heartbeatDictionaryWithFileURL:readingURL];
                                         }];
-  return heartbeatDictionary[tag];
+  NSDate *heartbeatDate = heartbeatDictionary[tag];
+  if (![heartbeatDate isKindOfClass:[NSDate class]]) {
+    return nil;
+  }
+  return heartbeatDate;
 }
 
 - (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag {
@@ -118,7 +122,7 @@ NSString *const kGULHeartbeatStorageDirectory = @"Google/FIRApp";
                             [[self heartbeatDictionaryWithFileURL:readingURL] mutableCopy];
                         heartbeatDictionary[tag] = date;
                         NSError *error;
-                        isSuccess = [self writeDictionary:heartbeatDictionary.copy
+                        isSuccess = [self writeDictionary:[heartbeatDictionary copy]
                                             forWritingURL:writingURL
                                                     error:&error];
                       }];
@@ -148,7 +152,11 @@ NSString *const kGULHeartbeatStorageDirectory = @"Google/FIRApp";
 - (BOOL)writeDictionary:(NSDictionary *)dictionary
           forWritingURL:(NSURL *)writingFileURL
                   error:(NSError **)outError {
-  NSData *data = [GULSecureCoding archivedDataWithRootObject:dictionary error:outError];
+  // Archive a mutable copy `dictionary` for writing to disk. This is done for
+  // backwards compatibility. See Google Utilities issue #36 for more context.
+  // TODO: Remove usage of mutable copy in a future version of Google Utilities.
+  NSData *data = [GULSecureCoding archivedDataWithRootObject:[dictionary mutableCopy]
+                                                       error:outError];
   if (data.length == 0) {
     return NO;
   }
diff --git a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
index 9603ad2..9161408 100644
--- a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
+++ b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
@@ -18,6 +18,10 @@
 #import "GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorage.h"
 #import "GoogleUtilities/Environment/Public/GoogleUtilities/GULSecureCoding.h"
 
+// Import specific version implementations for compatibility testing.
+#import "GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.h"
+#import "GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.h"
+
 @interface GULHeartbeatDateStorageTest : XCTestCase
 @property(nonatomic) GULHeartbeatDateStorage *storage;
 @end
@@ -92,7 +96,7 @@ static NSString *const kTestFileName = @"GULStorageHeartbeatTestFile";
 
   // 2. Populate the storage file with heartbeat info.
   // 2.1 Create a dictionary with heartbeat info.
-  NSDate *storedDate = [NSDate dateWithTimeIntervalSince1970:0];
+  NSDate *storedDate = [NSDate distantPast];
   NSString *storedTag = @"stored-tag";
   NSDictionary *storedHeartbeatDictionary = @{storedTag : storedDate};
   // 2.2 Encode the dictionary.
@@ -169,6 +173,104 @@ static NSString *const kTestFileName = @"GULStorageHeartbeatTestFile";
   XCTAssertNil(retrievedDate);
 }
 
+- (void)testHeartbeatDateForTagWhenHeartbeatFileContainsUnexpectedContent {
+  // 1. Manually create the heartbeat directory.
+  NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
+  NSError *error;
+  BOOL directoryCreated = [self explicitlyCreateDirectoryForURL:heartbeatStorageDirectoryURL
+                                                      withError:&error];
+  XCTAssert(directoryCreated);
+
+  // 2. Populate the storage file with unexpected content.
+  NSArray *array = @[ [NSDate distantPast], [NSDate date], [NSDate distantFuture] ];
+  NSError *archiveError;
+  NSData *data = [GULSecureCoding archivedDataWithRootObject:array error:&archiveError];
+  XCTAssertNotNil(data);
+  XCTAssert(data.length > 0);
+  XCTAssertNil(archiveError);
+  NSURL *heartbeatStorageFileURL = [self fileURLForDirectory:heartbeatStorageDirectoryURL];
+  [data writeToURL:heartbeatStorageFileURL atomically:YES];
+
+  // 3. Retrieve saved heartbeat info and assert that it is nil.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:@"tag"];
+  XCTAssertNil(retrievedDate);
+}
+
+- (void)testSetHeartbeatDateForTagWhenHeartbeatFileContainsUnexpectedDictionaryContent {
+  // 1. Manually create the heartbeat directory.
+  NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
+  NSError *error;
+  BOOL directoryCreated = [self explicitlyCreateDirectoryForURL:heartbeatStorageDirectoryURL
+                                                      withError:&error];
+  XCTAssert(directoryCreated);
+
+  // 2. Populate the storage file with unexpected content.
+  NSDictionary *heartbeatDict = @{@"tag" : [NSDate distantPast]};
+  NSDictionary *nestedHeartbeatDict = @{@"tag" : heartbeatDict};
+  NSError *archiveError;
+  NSData *data = [GULSecureCoding archivedDataWithRootObject:nestedHeartbeatDict
+                                                       error:&archiveError];
+  XCTAssertNotNil(data);
+  XCTAssert(data.length > 0);
+  XCTAssertNil(archiveError);
+
+  NSURL *heartbeatStorageFileURL = [self fileURLForDirectory:heartbeatStorageDirectoryURL];
+  [data writeToURL:heartbeatStorageFileURL atomically:YES];
+
+  // 3. Create heartbeat info.
+  NSDate *date = [NSDate date];
+  NSString *tag = @"tag";
+
+  // 4. Retrieve heartbeat info that is not stored and assert the retrieved info is nil.
+  //    This assertion implies type validation in `heartbeatDateForTag:` has worked correctly.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertNil(retrievedDate);
+
+  // 5. Save the heartbeat info and assert the save was successful.
+  BOOL successfulSave = [self.storage setHearbeatDate:date forTag:tag];
+  XCTAssert(successfulSave);
+
+  // 6. Retrieve heartbeat info that is now stored and assert the retrieved info is accurate.
+  retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertEqualObjects(retrievedDate, date);
+}
+
+- (void)testSetHeartbeatDateForTagWhenHeartbeatFileContainsUnexpectedContent {
+  // 1. Manually create the heartbeat directory.
+  NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
+  NSError *error;
+  BOOL directoryCreated = [self explicitlyCreateDirectoryForURL:heartbeatStorageDirectoryURL
+                                                      withError:&error];
+  XCTAssert(directoryCreated);
+
+  // 2. Populate the storage file with unexpected content.
+  NSArray *array = @[ [NSDate distantPast], [NSDate date], [NSDate distantFuture] ];
+  NSError *archiveError;
+  NSData *data = [GULSecureCoding archivedDataWithRootObject:array error:&archiveError];
+  XCTAssertNotNil(data);
+  XCTAssert(data.length > 0);
+  XCTAssertNil(archiveError);
+
+  NSURL *heartbeatStorageFileURL = [self fileURLForDirectory:heartbeatStorageDirectoryURL];
+  [data writeToURL:heartbeatStorageFileURL atomically:YES];
+
+  // 3. Create heartbeat info.
+  NSDate *date = [NSDate date];
+  NSString *tag = @"tag";
+
+  // 4. Retrieve heartbeat info that is not stored and assert the retrieved info is nil.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertNil(retrievedDate);
+
+  // 5. Save the heartbeat info and assert the save was successful.
+  BOOL successfulSave = [self.storage setHearbeatDate:date forTag:tag];
+  XCTAssert(successfulSave);
+
+  // 6. Retrieve heartbeat info that is now stored and assert the retrieved info is accurate.
+  retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertEqualObjects(retrievedDate, date);
+}
+
 - (void)testSetHeartbeatDateForTagWhenHeartbeatFileReturnsInvalidData {
   // 1. Manually create the heartbeat directory.
   NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
@@ -202,6 +304,61 @@ static NSString *const kTestFileName = @"GULStorageHeartbeatTestFile";
   XCTAssertTrue([self.storage conformsToProtocol:@protocol(GULHeartbeatDateStorable)]);
 }
 
+#pragma mark - Version Compatibility (#36)
+
+- (void)testCompatibility_pre7_4_0 {
+  NSString *tag = @"tag";
+
+  // 1. Store heartbeat using current heartbeat API.
+  NSDate *distantPast = [NSDate distantPast];
+  BOOL successfulSave = [self.storage setHearbeatDate:distantPast forTag:tag];
+  XCTAssert(successfulSave);
+  [self assertStoredHeartbeatDictionaryIsKindOf:[NSMutableDictionary class]];
+
+  // 2. Developer downgrades to below 7.4.0.
+
+  // 3. Store heartbeat from pre-7.4.0 API and verify success.
+  NSDate *storedDate = [NSDate date];
+  GULHeartbeatDateStorage7_3_1 *storage7_3_1 =
+      [[GULHeartbeatDateStorage7_3_1 alloc] initWithFileName:kTestFileName];
+  // The following line caused crashes after persistent storage modifications by 7.4.0.
+  successfulSave = [storage7_3_1 setHearbeatDate:storedDate forTag:tag];
+  XCTAssert(successfulSave);
+  [self assertStoredHeartbeatDictionaryIsKindOf:[NSMutableDictionary class]];
+
+  NSDate *retrievedDate = [storage7_3_1 heartbeatDateForTag:tag];
+  XCTAssertEqualObjects(retrievedDate, storedDate);
+}
+
+- (void)testForwardCompatibility7_4_0 {
+  NSString *tag = @"tag";
+
+  // 1. Store heartbeat using heartbeat API from 7.4.0. (Immutable info is written to disk.)
+  NSDate *storedDate = [NSDate distantPast];
+  GULHeartbeatDateStorage7_4_0 *storage7_4_0 =
+      [[GULHeartbeatDateStorage7_4_0 alloc] initWithFileName:kTestFileName];
+  // The following line caused crashes after persistent storage modifications by 7.4.0.
+  BOOL successfulSave = [storage7_4_0 setHearbeatDate:storedDate forTag:tag];
+  XCTAssert(successfulSave);
+  [self assertStoredHeartbeatDictionaryIsKindOf:[NSDictionary class]];
+
+  // 2. Developer upgrades to current version.
+
+  // 3. Retrieve and then store heartbeat from current API and verify success.
+  NSDate *retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertNotNil(retrievedDate);
+  XCTAssertEqualObjects(retrievedDate, storedDate);
+
+  NSDate *date = [NSDate date];
+  successfulSave = [self.storage setHearbeatDate:date forTag:tag];
+  XCTAssert(successfulSave);
+  [self assertStoredHeartbeatDictionaryIsKindOf:[NSMutableDictionary class]];
+
+  retrievedDate = [self.storage heartbeatDateForTag:tag];
+  XCTAssertNotNil(retrievedDate);
+  XCTAssertEqualObjects(retrievedDate, date);
+}
+
 #pragma mark - Testing Utilities
 
 - (BOOL)createRootDirectoryWithError:(NSError *__autoreleasing _Nullable *)outError {
@@ -263,4 +420,18 @@ static NSString *const kTestFileName = @"GULStorageHeartbeatTestFile";
   return fileURL;
 }
 
+- (void)assertStoredHeartbeatDictionaryIsKindOf:(Class)class {
+  NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
+  NSURL *heartbeatStorageFileURL = [self fileURLForDirectory:heartbeatStorageDirectoryURL];
+  NSData *objectData = [NSData dataWithContentsOfURL:heartbeatStorageFileURL options:0 error:nil];
+  __auto_type objectClasses = [NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]];
+  NSMutableDictionary *heartbeatDict = [GULSecureCoding unarchivedObjectOfClasses:objectClasses
+                                                                         fromData:objectData
+                                                                            error:nil];
+  if (class == [NSDictionary class]) {
+    XCTAssertFalse([heartbeatDict isKindOfClass:[NSMutableDictionary class]]);
+  }
+  XCTAssertTrue([heartbeatDict isKindOfClass:class]);
+}
+
 @end
diff --git a/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.h b/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.h
new file mode 100644
index 0000000..ef983da
--- /dev/null
+++ b/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.h
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// MARK: This file is strictly for version compatibility testing.
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+/// Stores either a date or a dictionary to a specified file.
+@interface GULHeartbeatDateStorage7_3_1 : NSObject
+
+- (instancetype)init NS_UNAVAILABLE;
+
+@property(nonatomic, readonly) NSURL *fileURL;
+
+/**
+ * Default initializer.
+ * @param fileName The name of the file to store the date information.
+ * exist, it will be created if needed.
+ */
+- (instancetype)initWithFileName:(NSString *)fileName;
+
+/**
+ * Reads the date from the specified file for the given tag.
+ * @return Returns date if exists, otherwise `nil`.
+ */
+- (nullable NSDate *)heartbeatDateForTag:(NSString *)tag;
+
+/**
+ * Saves the date for the specified tag in the specified file.
+ * @return YES on success, NO otherwise.
+ */
+- (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.m b/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.m
new file mode 100644
index 0000000..136169c
--- /dev/null
+++ b/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.m
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// MARK: This file is strictly for version compatibility testing.
+
+#import "GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.3.1.h"
+#import "GoogleUtilities/Environment/Public/GoogleUtilities/GULSecureCoding.h"
+
+@interface GULHeartbeatDateStorage7_3_1 ()
+/** The storage to store the date of the last sent heartbeat. */
+@property(nonatomic, readonly) NSFileCoordinator *fileCoordinator;
+/** The name of the file that stores heartbeat information. */
+@property(nonatomic, readonly) NSString *fileName;
+@end
+
+@implementation GULHeartbeatDateStorage7_3_1
+
+@synthesize fileURL = _fileURL;
+
+- (instancetype)initWithFileName:(NSString *)fileName {
+  if (fileName == nil) {
+    return nil;
+  }
+
+  self = [super init];
+  if (self) {
+    _fileCoordinator = [[NSFileCoordinator alloc] initWithFilePresenter:nil];
+    _fileName = fileName;
+  }
+  return self;
+}
+
+/** Lazy getter for fileURL
+ * @return fileURL where heartbeat information is stored.
+ */
+- (NSURL *)fileURL {
+  if (!_fileURL) {
+    NSURL *directoryURL = [[self class] directoryPathURL];
+    [[self class] checkAndCreateDirectory:directoryURL fileCoordinator:_fileCoordinator];
+    _fileURL = [directoryURL URLByAppendingPathComponent:_fileName];
+  }
+  return _fileURL;
+}
+
+/** Returns the URL path of the directory for heartbeat storage data.
+ * @return the URL path of the directory for heartbeat storage data.
+ */
++ (NSURL *)directoryPathURL {
+#if TARGET_OS_TV
+  NSArray<NSString *> *paths =
+      NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+#else
+  NSArray<NSString *> *paths =
+      NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+#endif
+  NSArray<NSString *> *components = @[ paths.lastObject, @"Google/FIRApp" ];
+  NSString *directoryString = [NSString pathWithComponents:components];
+  NSURL *directoryURL = [NSURL fileURLWithPath:directoryString];
+  return directoryURL;
+}
+
+/** Checks and creates a directory for the directory specified by the
+ * directory url
+ * @param directoryPathURL The path to the directory which needs to be created.
+ * @param fileCoordinator The fileCoordinator object to coordinate writes to the directory.
+ */
++ (void)checkAndCreateDirectory:(NSURL *)directoryPathURL
+                fileCoordinator:(NSFileCoordinator *)fileCoordinator {
+  NSError *fileCoordinatorError = nil;
+  [fileCoordinator
+      coordinateWritingItemAtURL:directoryPathURL
+                         options:0
+                           error:&fileCoordinatorError
+                      byAccessor:^(NSURL *writingDirectoryURL) {
+                        NSError *error;
+                        if (![writingDirectoryURL checkResourceIsReachableAndReturnError:&error]) {
+                          // If fail creating the Application Support directory, log warning.
+                          NSError *error;
+                          [[NSFileManager defaultManager] createDirectoryAtURL:writingDirectoryURL
+                                                   withIntermediateDirectories:YES
+                                                                    attributes:nil
+                                                                         error:&error];
+                        }
+                      }];
+}
+
+- (nullable NSMutableDictionary *)heartbeatDictionaryWithFileURL:(NSURL *)readingFileURL {
+  NSError *error;
+  NSMutableDictionary *dict;
+  NSData *objectData = [NSData dataWithContentsOfURL:readingFileURL options:0 error:&error];
+  if (objectData == nil || error != nil) {
+    dict = [NSMutableDictionary dictionary];
+  } else {
+    dict = [GULSecureCoding
+        unarchivedObjectOfClasses:[NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]]
+                         fromData:objectData
+                            error:&error];
+    if (dict == nil || error != nil) {
+      dict = [NSMutableDictionary dictionary];
+    }
+  }
+  return dict;
+}
+
+- (nullable NSDate *)heartbeatDateForTag:(NSString *)tag {
+  __block NSMutableDictionary *dict;
+  NSError *error;
+  [self.fileCoordinator coordinateReadingItemAtURL:self.fileURL
+                                           options:0
+                                             error:&error
+                                        byAccessor:^(NSURL *readingURL) {
+                                          dict = [self heartbeatDictionaryWithFileURL:readingURL];
+                                        }];
+  return dict[tag];
+}
+
+- (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag {
+  NSError *error;
+  __block BOOL isSuccess = false;
+  [self.fileCoordinator coordinateReadingItemAtURL:self.fileURL
+                                           options:0
+                                  writingItemAtURL:self.fileURL
+                                           options:0
+                                             error:&error
+                                        byAccessor:^(NSURL *readingURL, NSURL *writingURL) {
+                                          NSMutableDictionary *dictionary =
+                                              [self heartbeatDictionaryWithFileURL:readingURL];
+                                          dictionary[tag] = date;
+                                          NSError *error;
+                                          isSuccess = [self writeDictionary:dictionary
+                                                              forWritingURL:writingURL
+                                                                      error:&error];
+                                        }];
+  return isSuccess;
+}
+
+- (BOOL)writeDictionary:(NSMutableDictionary *)dictionary
+          forWritingURL:(NSURL *)writingFileURL
+                  error:(NSError **)outError {
+  NSData *data = [GULSecureCoding archivedDataWithRootObject:dictionary error:outError];
+  if (*outError != nil) {
+    return false;
+  } else {
+    return [data writeToURL:writingFileURL atomically:YES];
+  }
+}
+
+@end
diff --git a/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.h b/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.h
new file mode 100644
index 0000000..ce7da7c
--- /dev/null
+++ b/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.h
@@ -0,0 +1,55 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// MARK: This file is strictly for version compatibility testing.
+
+#import <Foundation/Foundation.h>
+
+#import "GoogleUtilities/Environment/Public/GoogleUtilities/GULHeartbeatDateStorable.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+extern NSString *const kGULHeartbeatStorageDirectory7_4_0;  // Avoids duplicate linker error.
+
+/// Stores either a date or a dictionary to a specified file.
+@interface GULHeartbeatDateStorage7_4_0 : NSObject <GULHeartbeatDateStorable>
+
+- (instancetype)init NS_UNAVAILABLE;
+
+@property(nonatomic, readonly) NSURL *fileURL;
+
+/**
+ * Default initializer.
+ * @param fileName The name of the file to store the date information.
+ * exist, it will be created if needed.
+ */
+- (instancetype)initWithFileName:(NSString *)fileName;
+
+/**
+ * Reads the date from the specified file for the given tag.
+ * @return Returns date if exists, otherwise `nil`.
+ */
+- (nullable NSDate *)heartbeatDateForTag:(NSString *)tag;
+
+/**
+ * Saves the date for the specified tag in the specified file.
+ * @return YES on success, NO otherwise.
+ */
+- (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag;
+
+@end
+
+NS_ASSUME_NONNULL_END
diff --git a/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.m b/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.m
new file mode 100644
index 0000000..2ec621e
--- /dev/null
+++ b/GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.m
@@ -0,0 +1,162 @@
+/*
+ * Copyright 2021 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// MARK: This file is strictly for version compatibility testing.
+
+#import "GoogleUtilities/Tests/Unit/Environment/Sources/GULHeartbeatDateStorageV7.4.0.h"
+#import "GoogleUtilities/Environment/Public/GoogleUtilities/GULSecureCoding.h"
+
+// Add static to avoid linker error.
+NSString *const kGULHeartbeatStorageDirectory7_4_0 = @"Google/FIRApp";
+
+@interface GULHeartbeatDateStorage7_4_0 ()
+/** The storage to store the date of the last sent heartbeat. */
+@property(nonatomic, readonly) NSFileCoordinator *fileCoordinator;
+/** The name of the file that stores heartbeat information. */
+@property(nonatomic, readonly) NSString *fileName;
+@end
+
+@implementation GULHeartbeatDateStorage7_4_0
+
+@synthesize fileURL = _fileURL;
+
+- (instancetype)initWithFileName:(NSString *)fileName {
+  if (fileName == nil) return nil;
+
+  self = [super init];
+  if (self) {
+    _fileCoordinator = [[NSFileCoordinator alloc] initWithFilePresenter:nil];
+    _fileName = fileName;
+  }
+  return self;
+}
+
+/** Lazy getter for fileURL.
+ * @return fileURL where heartbeat information is stored.
+ */
+- (NSURL *)fileURL {
+  if (!_fileURL) {
+    NSURL *directoryURL = [self directoryPathURL];
+    [self checkAndCreateDirectory:directoryURL];
+    _fileURL = [directoryURL URLByAppendingPathComponent:_fileName];
+  }
+  return _fileURL;
+}
+
+/** Returns the URL path of the directory for heartbeat storage data.
+ * @return the URL path of the directory for heartbeat storage data.
+ */
+- (NSURL *)directoryPathURL {
+  NSArray<NSString *> *paths;
+#if TARGET_OS_TV
+  paths = NSSearchPathForDirectoriesInDomains(NSCachesDirectory, NSUserDomainMask, YES);
+#else
+  paths = NSSearchPathForDirectoriesInDomains(NSApplicationSupportDirectory, NSUserDomainMask, YES);
+#endif  // TARGET_OS_TV
+  NSString *rootPath = [paths lastObject];
+  NSURL *rootURL = [NSURL fileURLWithPath:rootPath];
+  NSURL *directoryURL = [rootURL URLByAppendingPathComponent:kGULHeartbeatStorageDirectory7_4_0];
+  return directoryURL;
+}
+
+/** Check for the existence of the directory specified by the URL, and create it if it does not
+ * exist.
+ * @param directoryPathURL The path to the directory that needs to exist.
+ */
+- (void)checkAndCreateDirectory:(NSURL *)directoryPathURL {
+  NSError *fileCoordinatorError = nil;
+  [self.fileCoordinator
+      coordinateWritingItemAtURL:directoryPathURL
+                         options:0
+                           error:&fileCoordinatorError
+                      byAccessor:^(NSURL *writingDirectoryURL) {
+                        NSError *error;
+                        if (![writingDirectoryURL checkResourceIsReachableAndReturnError:&error]) {
+                          NSError *error;
+                          [[NSFileManager defaultManager] createDirectoryAtURL:writingDirectoryURL
+                                                   withIntermediateDirectories:YES
+                                                                    attributes:nil
+                                                                         error:&error];
+                        }
+                      }];
+}
+
+- (nullable NSDate *)heartbeatDateForTag:(NSString *)tag {
+  __block NSDictionary *heartbeatDictionary;
+  NSError *error;
+  [self.fileCoordinator coordinateReadingItemAtURL:self.fileURL
+                                           options:0
+                                             error:&error
+                                        byAccessor:^(NSURL *readingURL) {
+                                          heartbeatDictionary =
+                                              [self heartbeatDictionaryWithFileURL:readingURL];
+                                        }];
+  return heartbeatDictionary[tag];
+}
+
+- (BOOL)setHearbeatDate:(NSDate *)date forTag:(NSString *)tag {
+  NSError *error;
+  __block BOOL isSuccess = false;
+  [self.fileCoordinator
+      coordinateReadingItemAtURL:self.fileURL
+                         options:0
+                writingItemAtURL:self.fileURL
+                         options:0
+                           error:&error
+                      byAccessor:^(NSURL *readingURL, NSURL *writingURL) {
+                        NSMutableDictionary *heartbeatDictionary =
+                            [[self heartbeatDictionaryWithFileURL:readingURL] mutableCopy];
+                        heartbeatDictionary[tag] = date;
+                        NSError *error;
+                        isSuccess = [self writeDictionary:heartbeatDictionary.copy
+                                            forWritingURL:writingURL
+                                                    error:&error];
+                      }];
+  return isSuccess;
+}
+
+- (NSDictionary *)heartbeatDictionaryWithFileURL:(NSURL *)readingFileURL {
+  NSDictionary *heartbeatDictionary = nil;
+
+  NSError *error;
+  NSData *objectData = [NSData dataWithContentsOfURL:readingFileURL options:0 error:&error];
+
+  if (objectData.length > 0 && error == nil) {
+    NSSet<Class> *objectClasses = [NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]];
+    heartbeatDictionary = [GULSecureCoding unarchivedObjectOfClasses:objectClasses
+                                                            fromData:objectData
+                                                               error:&error];
+  }
+
+  if (heartbeatDictionary.count == 0 || error != nil) {
+    heartbeatDictionary = [NSDictionary dictionary];
+  }
+
+  return heartbeatDictionary;
+}
+
+- (BOOL)writeDictionary:(NSDictionary *)dictionary
+          forWritingURL:(NSURL *)writingFileURL
+                  error:(NSError **)outError {
+  NSData *data = [GULSecureCoding archivedDataWithRootObject:dictionary error:outError];
+  if (data.length == 0) {
+    return NO;
+  }
+
+  return [data writeToURL:writingFileURL atomically:YES];
+}
+
+@end

From a43a709d02f9456ff580e201ab2124c10d125b4e Mon Sep 17 00:00:00 2001
From: Gran <granluo@google.com>
Date: Thu, 27 May 2021 10:18:29 -0700
Subject: [PATCH 25/33] Update workflow. (#39)

---
 .github/workflows/test_coverage.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml
index 207323d..bdeeb27 100644
--- a/.github/workflows/test_coverage.yml
+++ b/.github/workflows/test_coverage.yml
@@ -69,11 +69,11 @@ jobs:
         common_commit=$(git merge-base remotes/origin/${pr_branch} remotes/origin/main)
         GITHUB_SHA=$(cat $GITHUB_EVENT_PATH | jq -r .pull_request.head.sha)
         if [ -d "${{steps.download.outputs.download-path}}" ]; then
-        firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/.build/debug/CoverageReportGenerator --presubmit "google/GoogleUtilities" --commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "${{steps.download.outputs.download-path}}/codecoverage" --log-link "https://github.com/google/GoogleUtilities/actions/runs/${GITHUB_RUN_ID}" --pull-request-num ${{github.event.pull_request.number}} --base-commit "$common_commit"
+        firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/.build/debug/CoverageReportGenerator --presubmit "google/GoogleUtilities" --head-commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "${{steps.download.outputs.download-path}}/codecoverage" --log-link "https://github.com/google/GoogleUtilities/actions/runs/${GITHUB_RUN_ID}" --pull-request-num ${{github.event.pull_request.number}} --base-commit "$common_commit"
         fi
     - name: Update New Coverage Data
       if: github.event.pull_request.merged == true && env.METRICS_SERVICE_SECRET
       run: |
         if [ -d "${{steps.download.outputs.download-path}}" ]; then
-        firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/.build/debug/CoverageReportGenerator --merge "google/GoogleUtilities" --commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "${{steps.download.outputs.download-path}}/codecoverage" --log-link "https://github.com/google/GoogleUtilities/actions/runs/${GITHUB_RUN_ID}" --branch "${GITHUB_REF##*/}"
+        firebase-ios-sdk/scripts/code_coverage_report/generate_code_coverage_report/.build/debug/CoverageReportGenerator --merge "google/GoogleUtilities" --head-commit "${GITHUB_SHA}" --token $(gcloud auth print-identity-token) --xcresult-dir "${{steps.download.outputs.download-path}}/codecoverage" --log-link "https://github.com/google/GoogleUtilities/actions/runs/${GITHUB_RUN_ID}" --source-branch "${{ github.base_ref }}"
         fi

From 5cd941e0b83c7ad2e674d0a22d12b7e565e192c0 Mon Sep 17 00:00:00 2001
From: Ryan Wilson <wilsonryan@google.com>
Date: Tue, 8 Jun 2021 14:36:40 -0400
Subject: [PATCH 26/33] Fix warnings in Xcode 13 beta 1. (#41)

---
 Package.swift | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/Package.swift b/Package.swift
index 6da16a8..3a7b6f8 100644
--- a/Package.swift
+++ b/Package.swift
@@ -79,7 +79,6 @@ let package = Package(
                      "GoogleUtilities_Network"],
       path: "GoogleUtilities",
       exclude: [
-        "README.md",
         "AppDelegateSwizzler/README.md",
         "Environment/",
         "Network/",
@@ -94,8 +93,7 @@ let package = Package(
       ],
       sources: [
         "AppDelegateSwizzler/",
-        "SceneDelegateSwizzler/",
-        "Common/*.h",
+        "Common/",
       ],
       publicHeadersPath: "AppDelegateSwizzler/Public",
       cSettings: [

From 5b9fc55628b94740b9666a558570f3a89a626c3d Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 8 Jun 2021 14:43:15 -0400
Subject: [PATCH 27/33] Generalize release command (#38)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 3268a6c..de808d2 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,7 @@ The release process is as follows:
 
   It's recommended to point to the `GoogleUtilities.podspec` in `staging` to make sure the correct spec is being published.
   ```console
-  pod trunk push ~/.cocoapods/repos/staging/GoogleUtilities/7.4.0/GoogleUtilities.podspec
+  pod trunk push ~/.cocoapods/repos/staging/GoogleUtilities/{version}/GoogleUtilities.podspec
   ```
   *Note: In some cases, it may be acceptable to `pod trunk push` with the `--skip-tests` flag. Please double check with
   the maintainers before doing so.*

From e975fbae546e052ccbb9d0e134207e5a476ab422 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:32:40 -0400
Subject: [PATCH 28/33] Include all object classes when using archiver (#42)

* Explicitly add object classes

* Update CHANGELOG

* Review

* Review 2
---
 CHANGELOG.md                                                 | 3 +++
 GoogleUtilities/Environment/GULHeartbeatDateStorage.m        | 3 ++-
 .../Tests/Unit/Environment/GULHeartbeatDateStorageTest.m     | 3 ++-
 .../Tests/Unit/Environment/GULKeychainStorageTests.m         | 2 ++
 .../Tests/Unit/SecureCoding/GULSecureCodingTests.m           | 5 +++--
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c4b26c4..d8d0a66 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 7.4.2
+- Include all object classes when using archiver. (#42)
+
 # 7.4.1
 - Improve heartbeat date storage's version compatability. (#37)
 
diff --git a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
index 7ac08f9..25ee5f4 100644
--- a/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
+++ b/GoogleUtilities/Environment/GULHeartbeatDateStorage.m
@@ -136,7 +136,8 @@ NSString *const kGULHeartbeatStorageDirectory = @"Google/FIRApp";
   NSData *objectData = [NSData dataWithContentsOfURL:readingFileURL options:0 error:&error];
 
   if (objectData.length > 0 && error == nil) {
-    NSSet<Class> *objectClasses = [NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]];
+    NSSet<Class> *objectClasses =
+        [NSSet setWithArray:@[ NSDictionary.class, NSDate.class, NSString.class ]];
     heartbeatDictionary = [GULSecureCoding unarchivedObjectOfClasses:objectClasses
                                                             fromData:objectData
                                                                error:&error];
diff --git a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
index 9161408..5f74423 100644
--- a/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
+++ b/GoogleUtilities/Tests/Unit/Environment/GULHeartbeatDateStorageTest.m
@@ -424,7 +424,8 @@ static NSString *const kTestFileName = @"GULStorageHeartbeatTestFile";
   NSURL *heartbeatStorageDirectoryURL = [self pathURLForDirectory:kGULHeartbeatStorageDirectory];
   NSURL *heartbeatStorageFileURL = [self fileURLForDirectory:heartbeatStorageDirectoryURL];
   NSData *objectData = [NSData dataWithContentsOfURL:heartbeatStorageFileURL options:0 error:nil];
-  __auto_type objectClasses = [NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]];
+  __auto_type objectClasses =
+      [NSSet setWithArray:@[ NSDictionary.class, NSDate.class, NSString.class ]];
   NSMutableDictionary *heartbeatDict = [GULSecureCoding unarchivedObjectOfClasses:objectClasses
                                                                          fromData:objectData
                                                                             error:nil];
diff --git a/GoogleUtilities/Tests/Unit/Environment/GULKeychainStorageTests.m b/GoogleUtilities/Tests/Unit/Environment/GULKeychainStorageTests.m
index 5fa3486..7e79095 100644
--- a/GoogleUtilities/Tests/Unit/Environment/GULKeychainStorageTests.m
+++ b/GoogleUtilities/Tests/Unit/Environment/GULKeychainStorageTests.m
@@ -87,6 +87,8 @@
 
   // 3. Read existing object which is not present in in-memory cache.
   [self.cache removeAllObjects];
+  // TODO: Evaluate if GULKeychainStorage needs an API that takes set of classes. (#42)
+  // The following method causes an NSKeyedUnarchiver-related runtime warning log.
   [self assertSuccessReadObject:@{@"key" : @"value"}
                          forKey:@"test-key1"
                           class:[NSDictionary class]
diff --git a/GoogleUtilities/Tests/Unit/SecureCoding/GULSecureCodingTests.m b/GoogleUtilities/Tests/Unit/SecureCoding/GULSecureCodingTests.m
index 6352da8..d936469 100644
--- a/GoogleUtilities/Tests/Unit/SecureCoding/GULSecureCodingTests.m
+++ b/GoogleUtilities/Tests/Unit/SecureCoding/GULSecureCodingTests.m
@@ -37,7 +37,7 @@
 @implementation GULSecureCodingTests
 
 - (void)testArchiveUnarchiveSingleClass {
-  NSDictionary *objectToArchive = @{@"key1" : @"value1", @"key2" : @(2)};
+  NSDictionary *objectToArchive = @{};
 
   NSError *error;
   NSData *archiveData = [GULSecureCoding archivedDataWithRootObject:objectToArchive error:&error];
@@ -60,7 +60,8 @@
   XCTAssertNotNil(archiveData);
 
   NSDictionary *unarchivedObject = [GULSecureCoding
-      unarchivedObjectOfClasses:[NSSet setWithArray:@[ NSDictionary.class, NSDate.class ]]
+      unarchivedObjectOfClasses:
+          [NSSet setWithArray:@[ NSDictionary.class, NSDate.class, NSString.class, NSNumber.class ]]
                        fromData:archiveData
                           error:&error];
   XCTAssertNil(error);

From b184ac2cc2832a3be9e29f6b98cfca00d28999f6 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 22 Jun 2021 19:38:18 -0400
Subject: [PATCH 29/33] Update spec for 7.4.2 release (#43)

---
 GoogleUtilities.podspec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index e10d12c..0d924bb 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.4.1'
+  s.version          = '7.4.2'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC

From 94f9ab80d39da19dd3a2492d5451e909333f0269 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Wed, 23 Jun 2021 19:33:28 -0400
Subject: [PATCH 30/33] Prep for 7.4.3 release (#44)

* Prep for 7.4.3 release

* Add SwiftPM 7.4.2 release note

* whitespace...

* more whitespace :/
---
 CHANGELOG.md            | 5 ++++-
 GoogleUtilities.podspec | 2 +-
 README.md               | 5 +++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d8d0a66..16dc026 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,9 @@
-# 7.4.2
+# 7.4.3
 - Include all object classes when using archiver. (#42)
 
+# 7.4.2 (Swift PM)
+- Fix warnings in Xcode 13 beta 1. (#41)
+
 # 7.4.1
 - Improve heartbeat date storage's version compatability. (#37)
 
diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index 0d924bb..1eb1afa 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.4.2'
+  s.version          = '7.4.3'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC
diff --git a/README.md b/README.md
index de808d2..696ee81 100644
--- a/README.md
+++ b/README.md
@@ -16,6 +16,11 @@ These instructions apply to minor and patch version updates. Major versions need
 a customized adaptation.
 
 After the CI is green:
+* Determine the next version for release by checking the
+  [tagged releases](https://github.com/google/GoogleUtilities/tags).
+  Ensure that the next release version keeps Swift PM and CocoaPods respective versions in in sync.
+* Verify that the releasing version has the latest entry in the [CHANGELOG.md](CHANGELOG.md),
+  updating it if necessary.
 * Update the version in the podspec to match the latest entry in the [CHANGELOG.md](CHANGELOG.md)
 * Checkout the `main` branch and ensure it is up to date
   ```console

From 460b5ef131e859abc73728ac6e49a333783bdb67 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Thu, 24 Jun 2021 11:43:16 -0400
Subject: [PATCH 31/33] Update release instructions (#45)

* Update release instructions

* whitespace

* Replace GDT references with GULs
---
 README.md | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 696ee81..d3ee9d2 100644
--- a/README.md
+++ b/README.md
@@ -18,8 +18,8 @@ a customized adaptation.
 After the CI is green:
 * Determine the next version for release by checking the
   [tagged releases](https://github.com/google/GoogleUtilities/tags).
-  Ensure that the next release version keeps Swift PM and CocoaPods respective versions in in sync.
-* Verify that the releasing version has the latest entry in the [CHANGELOG.md](CHANGELOG.md),
+  Ensure that the next release version keeps the Swift PM and CocoaPods versions in sync.
+* Verify that the releasing version is the latest entry in the [CHANGELOG.md](CHANGELOG.md),
   updating it if necessary.
 * Update the version in the podspec to match the latest entry in the [CHANGELOG.md](CHANGELOG.md)
 * Checkout the `main` branch and ensure it is up to date
@@ -69,7 +69,8 @@ After the CI is green:
 The release process is as follows:
 1. [Tag and release for Swift PM](#swift-package-manager)
 2. [Publish to CocoaPods](#cocoapods)
-3. [Perform post release cleanup](#post-release-cleanup)
+3. [Create GitHub Release](#create-github-release)
+4. [Perform post release cleanup](#post-release-cleanup)
 
 ### Swift Package Manager
   By creating and [pushing a tag](https://github.com/google/GoogleUtilities/tags)
@@ -98,18 +99,30 @@ The release process is as follows:
   should appear in the [CocoaPods specs repo](https://github.com/CocoaPods/Specs). Last, the latest version should be displayed
   on [GoogleUtilities's CocoaPods page](https://cocoapods.org/pods/GoogleUtilities).
 
+### [Create GitHub Release](https://github.com/google/GoogleUtilities/releases/new/)
+  Update the [release template](https://github.com/google/GoogleUtilities/releases/new/)'s **Tag version** and **Release title**
+  fields with the latest version. In addition, reference the [Release Notes](./CHANGELOG.md) in the release's description.
+
+  See [this release](https://github.com/google/GoogleUtilities/releases/edit/9.0.1) for an example.
+
   *Don't forget to perform the [post release cleanup](#post-release-cleanup)!*
 
 ### Post Release Cleanup
-* Clean up [SpecsStaging](https://github.com/firebase/SpecsStaging):
+  <details>
+  <summary>Clean up <b>SpecsStaging</b></summary>
+
   ```console
-  cd ~/path/to/SpecsStaging/
-  git checkout master
-  git pull
+  pwd=$(pwd)
+  mkdir -p /tmp/release-cleanup && cd $_
+  git clone git@github.com:firebase/SpecsStaging.git
+  cd SpecsStaging/
   git rm -rf GoogleUtilities/
-  git commit -m "Post GoogleUtilities {version} release cleanup"
-  git push
+  git commit -m "Post publish cleanup"
+  git push origin master
+  rm -rf /tmp/release-cleanup
+  cd $pwd
   ```
+  </details>
 
 ## Development
 

From 7df9cd01e7bee3f8ebcc7a47c47f0370b4de0c6d Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Thu, 8 Jul 2021 16:42:33 -0400
Subject: [PATCH 32/33] Bump promises dependency (#46)

* Bump promises dependency

* Fix podspec

* Fix package manifest

* CHANGELOG
---
 CHANGELOG.md            | 3 +++
 GoogleUtilities.podspec | 4 ++--
 Package.swift           | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16dc026..de28068 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 7.4.4
+- Bump promises dependency #46
+
 # 7.4.3
 - Include all object classes when using archiver. (#42)
 
diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index 1eb1afa..f4cd25a 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.4.3'
+  s.version          = '7.4.4'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC
@@ -38,7 +38,7 @@ other Google CocoaPods. They're not intended for direct public usage.
   s.subspec 'Environment' do |es|
     es.source_files = 'GoogleUtilities/Environment/**/*.[mh]'
     es.public_header_files = 'GoogleUtilities/Environment/Public/GoogleUtilities/*.h'
-    es.dependency 'PromisesObjC', '~> 1.2'
+    es.dependency 'PromisesObjC', '>= 1.2', '< 3.0'
     es.frameworks = [
       'Security'
     ]
diff --git a/Package.swift b/Package.swift
index 3a7b6f8..3316c85 100644
--- a/Package.swift
+++ b/Package.swift
@@ -63,7 +63,7 @@ let package = Package(
     ),
   ],
   dependencies: [
-    .package(name: "Promises", url: "https://github.com/google/promises.git", "1.2.8" ..< "1.3.0"),
+    .package(name: "Promises", url: "https://github.com/google/promises.git", "1.2.8" ..< "3.0.0"),
     .package(
       name: "OCMock",
       url: "https://github.com/firebase/ocmock.git",

From beb713a16b50a4df3162b3f3ecdeffa16b74b773 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Thu, 8 Jul 2021 17:32:12 -0400
Subject: [PATCH 33/33] Fix CHANGELOG.md & Fix #46's spec bump (#47)

* Update CHANGELOG.md

* Bump to minor and fix CHANGELOG
---
 CHANGELOG.md            | 4 ++--
 GoogleUtilities.podspec | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de28068..81336ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,5 @@
-# 7.4.4
-- Bump promises dependency #46
+# 7.5.0
+- Bump Promises dependency. (#8334)
 
 # 7.4.3
 - Include all object classes when using archiver. (#42)
diff --git a/GoogleUtilities.podspec b/GoogleUtilities.podspec
index f4cd25a..de621db 100644
--- a/GoogleUtilities.podspec
+++ b/GoogleUtilities.podspec
@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name             = 'GoogleUtilities'
-  s.version          = '7.4.4'
+  s.version          = '7.5.0'
   s.summary          = 'Google Utilities for Apple platform SDKs'
 
   s.description      = <<-DESC