Skip to content

Commit a69962d

Browse files
authored
Upgrade to clang-format v17 (#11824)
1 parent f49a14c commit a69962d

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ To develop Firebase software, **install**:
132132
To install [clang-format] and [mint] using [Homebrew]:
133133

134134
```console
135-
brew install clang-format@16
135+
brew install clang-format@17
136136
brew install mint
137137
```
138138

FirebaseAuth/Sources/Auth/FIRAuth.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2373,7 +2373,7 @@ - (BOOL)saveUser:(nullable FIRUser *)user error:(NSError *_Nullable *_Nullable)o
23732373
#else
23742374
// Encode the user object.
23752375
NSMutableData *archiveData = [NSMutableData data];
2376-
// iOS 12 deprecation
2376+
// iOS 12 deprecation
23772377
#pragma clang diagnostic push
23782378
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
23792379
NSKeyedArchiver *archiver =
@@ -2439,7 +2439,7 @@ - (BOOL)getUser:(FIRUser *_Nullable *)outUser error:(NSError *_Nullable *_Nullab
24392439
return NO;
24402440
}
24412441
#else
2442-
// iOS 12 deprecation
2442+
// iOS 12 deprecation
24432443
#pragma clang diagnostic push
24442444
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
24452445
NSKeyedUnarchiver *unarchiver =
@@ -2621,7 +2621,7 @@ - (nullable FIRUser *)getStoredUserForAccessGroup:(NSString *_Nullable)accessGro
26212621
return nil;
26222622
}
26232623
#else
2624-
// iOS 12 deprecation
2624+
// iOS 12 deprecation
26252625
#pragma clang diagnostic push
26262626
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
26272627
NSKeyedUnarchiver *unarchiver =

FirebaseAuth/Sources/SystemService/FIRAuthAppCredentialManager.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ - (instancetype)initWithKeychain:(FIRAuthKeychainServices *)keychain {
7373
NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingFromData:encodedData
7474
error:&error];
7575
#else
76-
// iOS 12 deprecation
76+
// iOS 12 deprecation
7777
#pragma clang diagnostic push
7878
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
7979
NSKeyedUnarchiver *unarchiver =

FirebaseAuth/Sources/SystemService/FIRAuthStoredUserManager.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ - (FIRUser *)getStoredUserForAccessGroup:(NSString *)accessGroup
8989
return nil;
9090
}
9191
#else
92-
// iOS 12 deprecation
92+
// iOS 12 deprecation
9393
#pragma clang diagnostic push
9494
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
9595
NSKeyedUnarchiver *unarchiver = [[NSKeyedUnarchiver alloc] initForReadingWithData:data];
@@ -118,7 +118,7 @@ - (BOOL)setStoredUser:(FIRUser *)user
118118
NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initRequiringSecureCoding:false];
119119
#else
120120
NSMutableData *data = [NSMutableData data];
121-
// iOS 12 deprecation
121+
// iOS 12 deprecation
122122
#pragma clang diagnostic push
123123
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
124124
NSKeyedArchiver *archiver = [[NSKeyedArchiver alloc] initForWritingWithMutableData:data];

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ GitHub Actions will verify that any code changes are done in a style-compliant
153153
way. Install `clang-format` and `mint`:
154154

155155
```console
156-
brew install clang-format@16
156+
brew install clang-format@17
157157
brew install mint
158158
```
159159

scripts/setup_check.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ fi
3535

3636
# install clang-format
3737
brew update
38-
brew install clang-format@16
38+
brew install clang-format@17
3939

4040
# mint installs tools from Mintfile on demand.
4141
brew install mint

scripts/style.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ version="${version/ (*)/}"
5656
version="${version/.*/}"
5757

5858
case "$version" in
59-
16)
59+
17)
6060
;;
6161
google3-trunk)
6262
echo "Please use a publicly released clang-format; a recent LLVM release"
@@ -65,7 +65,7 @@ case "$version" in
6565
exit 1
6666
;;
6767
*)
68-
echo "Please upgrade to clang-format version 16."
68+
echo "Please upgrade to clang-format version 17."
6969
echo "If it's installed via homebrew you can run:"
7070
echo "brew upgrade clang-format"
7171
exit 1

0 commit comments

Comments
 (0)