diff options
| author | Fabian Meumertzheim <fabian@meumertzhe.im> | 2021-10-29 11:14:37 +0200 |
|---|---|---|
| committer | Fabian Meumertzheim <fabian@meumertzhe.im> | 2021-10-29 11:25:07 +0200 |
| commit | d1835d6fa2ebfb7b2661cfaaa8acb8bbf42bb486 (patch) | |
| tree | 4d8af913302f10d8723f0f5b885bce5e08874b45 | |
| parent | 40e8ea4a4c45e78fe3cbc67618ca0673f3b781d8 (diff) | |
| download | jazzer-api-d1835d6fa2ebfb7b2661cfaaa8acb8bbf42bb486.tar.gz | |
Update formatters and reformat
The ktlint update is required for Java 17 compatibility.
| -rw-r--r-- | .github/workflows/check-formatting.yml | 6 | ||||
| -rw-r--r-- | driver/fuzz_target_runner.cpp | 4 | ||||
| -rwxr-xr-x | format.sh | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml index b422be50..c32aaff1 100644 --- a/.github/workflows/check-formatting.yml +++ b/.github/workflows/check-formatting.yml @@ -25,9 +25,9 @@ jobs: run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo apt-get install software-properties-common - sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main' - sudo apt-get install clang-format-11 - curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.40.0/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/bin/ktlint + sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main' + sudo apt-get install clang-format-13 + curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.42.1/ktlint && chmod a+x ktlint && sudo mv ktlint /usr/bin/ktlint go get -u github.com/google/addlicense go get github.com/bazelbuild/buildtools/buildifier diff --git a/driver/fuzz_target_runner.cpp b/driver/fuzz_target_runner.cpp index adefb01a..934e27e1 100644 --- a/driver/fuzz_target_runner.cpp +++ b/driver/fuzz_target_runner.cpp @@ -379,8 +379,8 @@ std::string FuzzTargetRunner::DetectFuzzTargetClass() const { jmethodID detect_fuzz_target_class = jvm_.GetStaticMethodID( manifest_utils, "detectFuzzTargetClass", "()Ljava/lang/String;", true); auto &env = jvm_.GetEnv(); - auto jni_fuzz_target_class = (jstring)( - env.CallStaticObjectMethod(manifest_utils, detect_fuzz_target_class)); + auto jni_fuzz_target_class = (jstring)(env.CallStaticObjectMethod( + manifest_utils, detect_fuzz_target_class)); if (env.ExceptionCheck()) { env.ExceptionDescribe(); exit(1); @@ -1,8 +1,8 @@ # C++ & Java -find -name '*.cpp' -o -name '*.h' -o -name '*.java' | xargs clang-format-11 -i +find -name '*.cpp' -o -name '*.h' -o -name '*.java' | xargs clang-format-13 -i # Kotlin -# curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.40.0/ktlint && chmod a+x ktlint +# curl -sSLO https://github.com/pinterest/ktlint/releases/download/0.42.1/ktlint && chmod a+x ktlint ktlint -F "agent/**/*.kt" "driver/**/*.kt" "examples/**/*.kt" "sanitizers/**/*.kt" # BUILD files |