build(ios): Upgrade clang-format from v20 to v22

Homebrew now installs clang-format v22 which formats ObjC empty
dictionary literals as `@{ }` instead of `@{}`. This caused a mismatch
between local formatting and CI (which used v20), making it impossible
to commit clang-format fixes that pass CI.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: antonis

.github/workflows/buildandtest.yml

@@ -53,16 +53,16 @@ jobs:
 
       # Default of ubuntu and apt packages are too old compared to macos packages.
       # This is required for using a newer version of clang-format.
-      - name: Setup clang-format V20
+      - name: Setup clang-format V22
         run: |
-          sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" 20
-          sudo apt-get install -y clang-20 clang-format-20 lld-20 lldb-20
+          sudo bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)" 22
+          sudo apt-get install -y clang-22 clang-format-22 lld-22 lldb-22
 
-      - name: Set clang-format V20 as default
+      - name: Set clang-format V22 as default
         run: |
-          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-20 200
-          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-20 200
-          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-20 200
+          sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-22 200
+          sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-22 200
+          sudo update-alternatives --install /usr/bin/clang-format clang-format /usr/bin/clang-format-22 200
           clang --version
           clang-format --version
 

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryTests.m

@@ -1014,7 +1014,7 @@ - (void)testCreateUserWithPartialGeoDataCreatesSentryGeoObject
     NSDictionary *userKeys =
         @{ @"id" : @"456", @"geo" : @ { @"city" : @"New York", @"country_code" : @"US" } };
 
-    NSDictionary *userDataKeys = @{};
+    NSDictionary *userDataKeys = @{ };
 
     SentryUser *user = [RNSentry userFrom:userKeys otherUserKeys:userDataKeys];
 
@@ -1031,9 +1031,9 @@ - (void)testCreateUserWithPartialGeoDataCreatesSentryGeoObject
 
 - (void)testCreateUserWithEmptyGeoDataCreatesSentryGeoObject
 {
-    NSDictionary *userKeys = @{ @"id" : @"789", @"geo" : @ {} };
+    NSDictionary *userKeys = @{ @"id" : @"789", @"geo" : @ { } };
 
-    NSDictionary *userDataKeys = @{};
+    NSDictionary *userDataKeys = @{ };
 
     SentryUser *user = [RNSentry userFrom:userKeys otherUserKeys:userDataKeys];
 
@@ -1052,7 +1052,7 @@ - (void)testCreateUserWithoutGeoDataDoesNotCreateGeoObject
 {
     NSDictionary *userKeys = @{ @"id" : @"999", @"email" : @"test@example.com" };
 
-    NSDictionary *userDataKeys = @{};
+    NSDictionary *userDataKeys = @{ };
 
     SentryUser *user = [RNSentry userFrom:userKeys otherUserKeys:userDataKeys];
 

packages/core/RNSentryCocoaTester/RNSentryCocoaTesterTests/RNSentryUserTests.m

@@ -51,9 +51,9 @@ - (void)testNullUser
 - (void)testEmptyUser
 {
     SentryUser *expected = [[SentryUser alloc] init];
-    [expected setData:@{}];
+    [expected setData:@{ }];
 
-    SentryUser *actual = [RNSentry userFrom:@{} otherUserKeys:@{}];
+    SentryUser *actual = [RNSentry userFrom:@{ } otherUserKeys:@{ }];
     XCTAssertTrue([actual isEqualToUser:expected]);
 }
 
@@ -63,9 +63,9 @@ - (void)testInvalidUser
 
     SentryUser *actual = [RNSentry userFrom:@{
         @"id" : @123,
-        @"ip_address" : @ {},
-        @"email" : @ {},
-        @"username" : @ {},
+        @"ip_address" : @ { },
+        @"email" : @ { },
+        @"username" : @ { },
     }
                               otherUserKeys:nil];
 
@@ -79,9 +79,9 @@ - (void)testPartiallyInvalidUser
 
     SentryUser *actual = [RNSentry userFrom:@{
         @"id" : @"123",
-        @"ip_address" : @ {},
-        @"email" : @ {},
-        @"username" : @ {},
+        @"ip_address" : @ { },
+        @"email" : @ { },
+        @"username" : @ { },
     }
                               otherUserKeys:nil];
 
@@ -156,7 +156,7 @@ - (void)testUserWithEmptyGeo
     SentryGeo *expectedGeo = [SentryGeo alloc];
     [expected setGeo:expectedGeo];
 
-    SentryUser *actual = [RNSentry userFrom:@{ @"id" : @"123", @"geo" : @ {} } otherUserKeys:nil];
+    SentryUser *actual = [RNSentry userFrom:@{ @"id" : @"123", @"geo" : @ { } } otherUserKeys:nil];
 
     XCTAssertTrue([actual isEqualToUser:expected]);
 }

packages/core/ios/RNSentry.mm

@@ -299,7 +299,7 @@ - (void)stopObserving
 - (void)handleShakeDetected
 {
     if (_shakeDetectionEnabled) {
-        [self sendEventWithName:RNSentryOnShakeEvent body:@{}];
+        [self sendEventWithName:RNSentryOnShakeEvent body:@{ }];
     }
 }
 

packages/core/ios/RNSentryReplay.mm

@@ -23,7 +23,7 @@ + (BOOL)updateOptions:(NSMutableDictionary *)options
     }
 
     NSLog(@"Setting up session replay");
-    NSDictionary *replayOptions = options[@"mobileReplayOptions"] ?: @{};
+    NSDictionary *replayOptions = options[@"mobileReplayOptions"] ?: @{ };
 
     NSString *qualityString = options[@"replaysSessionQuality"];
 

packages/core/ios/RNSentrySDK.m

@@ -60,7 +60,7 @@ + (void)start:(NSString *)path configureOptions:(void (^)(SentryOptions *options
     if (options == nil) {
         // Fallback in case that options file could not be parsed.
         NSError *fallbackError = nil;
-        options = [PrivateSentrySDKOnly optionsWithDictionary:@{} didFailWithError:&fallbackError];
+        options = [PrivateSentrySDKOnly optionsWithDictionary:@{ } didFailWithError:&fallbackError];
         if (fallbackError != nil) {
             NSLog(@"[RNSentry] Failed to create fallback options with error: %@",
                 fallbackError.localizedDescription);

samples/react-native-macos/macos/sentry-react-native-sample-macOS/AppDelegate.mm

@@ -9,7 +9,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)notification
     self.moduleName = @"sentry-react-native-sample";
     // You can add your custom initial props in the dictionary below.
     // They will be passed down to the ViewController used by React Native.
-    self.initialProps = @{};
+    self.initialProps = @{ };
 
     return [super applicationDidFinishLaunching:notification];
 }

samples/react-native/ios/sentryreactnativesample/AppDelegate.mm

@@ -47,7 +47,7 @@ - (BOOL)application:(UIApplication *)application
 
     [self.reactNativeFactory startReactNativeWithModuleName:@"sentry-react-native-sample"
                                                    inWindow:self.window
-                                          initialProperties:@{}
+                                          initialProperties:@{ }
                                               launchOptions:launchOptions];
 
     [[UNUserNotificationCenter currentNotificationCenter] setDelegate:self];

scripts/clang-format.sh

@@ -4,7 +4,7 @@ set -eo pipefail
 
 echo "💡 If you get 'spawn Unknown system error -86', try running this script manually:"
 echo "   ./scripts/clang-format.sh $1"
-echo "💡 It is also recommended to use clang-version v20 or v21."
+echo "💡 It is also recommended to use clang-format v22 or newer."
 
 # Prioritize finding clang-format executable from brew since the run-s may introduce X86/ARM64 mismatch.
 CLANG_FORMAT_PATH=""
@@ -34,7 +34,7 @@ if ! printf '%s' "$CLANG_MAJOR_VERSION" | grep -qE '^[0-9]+$'; then
     exit 1
 fi
 
-REQUIRED_MAJOR=20
+REQUIRED_MAJOR=22
 if [ "$CLANG_MAJOR_VERSION" -lt "$REQUIRED_MAJOR" ]; then
     echo "❌ clang-format major version $CLANG_MAJOR_VERSION is lower than required $REQUIRED_MAJOR"
     exit 1