Update clang-format to 11 (#6905)

* Update clang-format to 11

* Upgrade clang format

* Install clang-format@11

* Update readme

* brew update

Author: maksymmalyhin

Firebase/CoreDiagnostics/FIRCDLibrary/FIRCoreDiagnostics.m

@@ -37,7 +37,7 @@
 
 #ifdef FIREBASE_BUILD_ZIP_FILE
 static BOOL kUsingZipFile = YES;
-#else   // FIREBASE_BUILD_ZIP_FILE
+#else  // FIREBASE_BUILD_ZIP_FILE
 static BOOL kUsingZipFile = NO;
 #endif  // FIREBASE_BUILD_ZIP_FILE
 

FirebaseDynamicLinks/Sources/Logging/FDLLogging.m

@@ -29,7 +29,7 @@
 
 #if __LP64__  // 64-bit
 NSString *const FDLMessageCodeIntegerFormat = @"%06ld";
-#else   // 32-bit
+#else  // 32-bit
 NSString *const FDLMessageCodeIntegerFormat = @"%06d";
 #endif  // #if __LP64__
 

Firestore/core/test/unit/util/ordered_code_test.cc

@@ -350,7 +350,7 @@ TEST(OrderedCodeInvalidEncodingsTest, NonCanonical) {
 
 #if defined(NDEBUG)
     EXPECT_ANY_THROW(TestRead<uint64_t>(INCREASING, non_minimal));
-#else   // defined(NDEBUG)
+#else  // defined(NDEBUG)
     absl::string_view s(non_minimal);
     EXPECT_ANY_THROW(OrderedCode::ReadNumIncreasing(&s, NULL));
 #endif  // defined(NDEBUG)
@@ -372,7 +372,7 @@ TEST(OrderedCodeInvalidEncodingsTest, NonCanonical) {
 
 #if defined(NDEBUG)
     EXPECT_ANY_THROW(TestRead<int64_t>(INCREASING, non_minimal));
-#else   // defined(NDEBUG)
+#else  // defined(NDEBUG)
     absl::string_view s(non_minimal);
     EXPECT_ANY_THROW(OrderedCode::ReadSignedNumIncreasing(&s, NULL));
     s = non_minimal;

GoogleDataTransport/GDTCORLibrary/GDTCORPlatform.m

@@ -149,7 +149,7 @@ GDTCORNetworkMobileSubtype GDTCORNetworkMobileSubTypeMessage() {
   } else {
     return GDTCORNetworkMobileSubtypeUNKNOWN;
   }
-#else   // TARGET_OS_IOS
+#else  // TARGET_OS_IOS
   return GDTCORNetworkMobileSubtypeUNKNOWN;
 #endif  // TARGET_OS_IOS
 }

README.md

@@ -144,7 +144,7 @@ GitHub Actions will verify that any code changes are done in a style compliant
 way. Install `clang-format` and `mint`:
 
 ```
-brew install clang-format
+brew install clang-format@11
 brew install mint
 ```
 

scripts/setup_check.sh

@@ -33,8 +33,11 @@ if ! git rev-parse origin/master >& /dev/null; then
   git fetch origin
 fi
 
+# install clang-format
+brew update
+brew install clang-format@11
+
 # mint installs tools from Mintfile on demand.
-brew install clang-format
 brew install mint
 
 # Explicitly mint bootstrap to show its version in the "Setup check" GHA phase

scripts/style.sh

@@ -42,7 +42,7 @@ version="${version/ (*)/}"
 version="${version/.*/}"
 
 case "$version" in
-  10)
+  11)
     ;;
   google3-trunk)
     echo "Please use a publicly released clang-format; a recent LLVM release"
@@ -51,7 +51,7 @@ case "$version" in
     exit 1
     ;;
   *)
-    echo "Please upgrade to clang-format version 10."
+    echo "Please upgrade to clang-format version 11."
     echo "If it's installed via homebrew you can run:"
     echo "brew upgrade clang-format"
     exit 1