From ad7f446b6031539a84128afddeb0e9e0c9129f05 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 3 Nov 2022 11:09:48 -0400 Subject: [PATCH 1/2] Upgrade clang-format@14 to clang-format@15 --- CONTRIBUTING.md | 2 +- README.md | 2 +- scripts/setup_check.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 7f045979846..3537831261a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -130,7 +130,7 @@ To develop Firebase software, **install**: To install [clang-format] and [mint] using [Homebrew]: ```console - brew install clang-format@14 + brew install clang-format@15 brew install mint ``` diff --git a/README.md b/README.md index d1c41013f38..920f08addfd 100644 --- a/README.md +++ b/README.md @@ -140,7 +140,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@14 +brew install clang-format@15 brew install mint ``` diff --git a/scripts/setup_check.sh b/scripts/setup_check.sh index 6072a8d92aa..6404eeca5bf 100755 --- a/scripts/setup_check.sh +++ b/scripts/setup_check.sh @@ -35,7 +35,7 @@ fi # install clang-format brew update -brew install clang-format@14 +brew install clang-format@15 # mint installs tools from Mintfile on demand. brew install mint From 79fb1499cf3a439d17904efa598076dc86917851 Mon Sep 17 00:00:00 2001 From: Denver Coneybeare Date: Thu, 3 Nov 2022 11:23:03 -0400 Subject: [PATCH 2/2] scripts/style.sh: check for version 15 of clang-format, not version 14. --- scripts/style.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/style.sh b/scripts/style.sh index 140ac75452d..4c068d73c6f 100755 --- a/scripts/style.sh +++ b/scripts/style.sh @@ -42,7 +42,7 @@ version="${version/ (*)/}" version="${version/.*/}" case "$version" in - 14) + 15) ;; 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 14." + echo "Please upgrade to clang-format version 15." echo "If it's installed via homebrew you can run:" echo "brew upgrade clang-format" exit 1