CI fixes now that default runners can be arm64

Gemfile

@@ -2,6 +2,6 @@
 # commit Gemfile and Gemfile.lock.
 source 'https://rubygems.org'
 
-gem 'cocoapods', '1.14.2'
+gem 'cocoapods', '1.15.2'
 gem 'cocoapods-generate', '2.0.1'
 gem 'danger', '8.4.5'

Gemfile.lock

@@ -1,9 +1,11 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.6)
+    CFPropertyList (3.0.7)
+      base64
+      nkf
       rexml
-    activesupport (7.1.1)
+    activesupport (7.1.3.2)
       base64
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
@@ -19,19 +21,19 @@ GEM
       httpclient (~> 2.8, >= 2.8.3)
       json (>= 1.5.1)
     atomos (0.1.3)
-    base64 (0.1.1)
-    bigdecimal (3.1.4)
+    base64 (0.2.0)
+    bigdecimal (3.1.7)
     claide (1.1.0)
     claide-plugins (0.9.2)
       cork
       nap
       open4 (~> 1.3)
-    cocoapods (1.14.2)
+    cocoapods (1.15.2)
       addressable (~> 2.8)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.14.2)
+      cocoapods-core (= 1.15.2)
       cocoapods-deintegrate (>= 1.0.3, < 2.0)
-      cocoapods-downloader (>= 2.0)
+      cocoapods-downloader (>= 2.1, < 3.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-trunk (>= 1.6.0, < 2.0)
@@ -44,7 +46,7 @@ GEM
       nap (~> 1.0)
       ruby-macho (>= 2.3.0, < 3.0)
       xcodeproj (>= 1.23.0, < 2.0)
-    cocoapods-core (1.14.2)
+    cocoapods-core (1.15.2)
       activesupport (>= 5.0, < 8)
       addressable (~> 2.8)
       algoliasearch (~> 1.0)
@@ -56,7 +58,7 @@ GEM
       typhoeus (~> 1.0)
     cocoapods-deintegrate (1.0.5)
     cocoapods-disable-podfile-validations (0.1.1)
-    cocoapods-downloader (2.0)
+    cocoapods-downloader (2.1)
     cocoapods-generate (2.0.1)
       cocoapods-disable-podfile-validations (~> 0.1.1)
     cocoapods-plugins (1.0.0)
@@ -67,7 +69,7 @@ GEM
       netrc (~> 0.11)
     cocoapods-try (1.2.0)
     colored2 (3.1.2)
-    concurrent-ruby (1.2.2)
+    concurrent-ruby (1.2.3)
     connection_pool (2.4.1)
     cork (0.3.0)
       colored2 (~> 3.1)
@@ -84,8 +86,7 @@ GEM
       no_proxy_fix
       octokit (~> 4.7)
       terminal-table (>= 1, < 4)
-    drb (2.1.1)
-      ruby2_keywords
+    drb (2.2.1)
     escape (0.0.4)
     ethon (0.16.0)
       ffi (>= 1.15.0)
@@ -122,20 +123,21 @@ GEM
       addressable (~> 2.8)
       rchardet (~> 1.8)
     httpclient (2.8.3)
-    i18n (1.14.1)
+    i18n (1.14.4)
       concurrent-ruby (~> 1.0)
-    json (2.6.3)
+    json (2.7.2)
     kramdown (2.4.0)
       rexml
     kramdown-parser-gfm (1.1.0)
       kramdown (~> 2.0)
-    minitest (5.20.0)
+    minitest (5.22.3)
     molinillo (0.8.0)
     multipart-post (2.2.3)
-    mutex_m (0.1.2)
+    mutex_m (0.2.0)
     nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
+    nkf (0.2.0)
     no_proxy_fix (0.1.2)
     octokit (4.25.1)
       faraday (>= 1, < 3)
@@ -151,12 +153,12 @@ GEM
       faraday (>= 0.17.3, < 3)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
-    typhoeus (1.4.0)
+    typhoeus (1.4.1)
       ethon (>= 0.9.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
     unicode-display_width (2.3.0)
-    xcodeproj (1.23.0)
+    xcodeproj (1.24.0)
       CFPropertyList (>= 2.3.3, < 4.0)
       atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
@@ -168,7 +170,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  cocoapods (= 1.14.2)
+  cocoapods (= 1.15.2)
   cocoapods-generate (= 2.0.1)
   danger (= 8.4.5)
 

GoogleUtilities/Tests/Unit/UserDefaults/GULUserDefaultsTests.m

@@ -395,8 +395,7 @@ - (void)testSynchronizeToDisk {
   // correct return value of `YES` is returned, but in this test it returns `NO`. Best guess is the
   // test app is sandboxed and `NSFileManager` is refusing to read the directory.
   // TODO: Investigate the failure and re-enable this test.
-  return;
-#endif  // TARGET_OS_OSX
+#else
   NSString *suiteName = [NSString stringWithFormat:@"another_test_suite"];
   NSString *filePath = [self filePathForPreferencesName:suiteName];
   NSFileManager *fileManager = [NSFileManager defaultManager];
@@ -417,6 +416,7 @@ - (void)testSynchronizeToDisk {
   [newUserDefaults synchronize];
 
   [self removePreferenceFileWithSuiteName:suiteName];
+#endif  // TARGET_OS_OSX || TARGET_OS_MACCATALYST || SWIFT_PACKAGE
 }
 
 - (void)testInvalidKeys {

SwiftPMTests/swift-test/main.swift

@@ -41,7 +41,8 @@ class importTest: XCTestCase {
     #else
       // Device model should show up as x86_64 for iOS, tvOS, and watchOS
       // simulators.
-      XCTAssertEqual(GULAppEnvironmentUtil.deviceModel(), "x86_64")
+      let device = GULAppEnvironmentUtil.deviceModel()
+      XCTAssertTrue(device == "x86_64" || device == "arm64")
     #endif
 
     print("System version? Answer: \(GULAppEnvironmentUtil.systemVersion())")