Add google-java-format-1.14.0 README.google: Name: Tool to reformat Java source code to comply with Google Java Style. URL: https://github.com/google/google-java-format/releases/tag/v1.14.0 Version: 1.14.0 Revision: NA Date: February 15th 2022 License: See LICENSE Change-Id: I613902d8963b5c43a8cf12ff58d84403bc459809
diff --git a/.gitignore b/.gitignore index dbe9747..c97f9a0 100644 --- a/.gitignore +++ b/.gitignore
@@ -77,6 +77,8 @@ third_party/framework.tar.gz third_party/gmail/* third_party/gmscore/* +third_party/google/google-java-format/1.14.0 +third_party/google/google-java-format/1.14.0.tar.gz third_party/google-java-format third_party/google-java-format.tar.gz third_party/goyt
diff --git a/PRESUBMIT.py b/PRESUBMIT.py index 8fbb76e..088b42f 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py
@@ -8,8 +8,10 @@ FMT_CMD = path.join( 'third_party', + 'google', 'google-java-format', - 'google-java-format-google-java-format-1.7', + '1.14.0', + 'google-java-format-1.14.0', 'scripts', 'google-java-format-diff.py')
diff --git a/build.gradle b/build.gradle index 560c1de..8562ff6 100644 --- a/build.gradle +++ b/build.gradle
@@ -345,6 +345,7 @@ "dart-sdk", "ddmlib", "gradle/gradle", + "google/google-java-format/1.14.0" "google-java-format", "iosched_2019", "jacoco/0.8.2",
diff --git a/third_party/google/google-java-format/1.14.0.tar.gz.sha1 b/third_party/google/google-java-format/1.14.0.tar.gz.sha1 new file mode 100644 index 0000000..4989c27 --- /dev/null +++ b/third_party/google/google-java-format/1.14.0.tar.gz.sha1
@@ -0,0 +1 @@ +b26f4b8c825401d198d54d5e230779fe7fc3c132 \ No newline at end of file
diff --git a/tools/fmt-diff.py b/tools/fmt-diff.py index fc08c80..cda33f9 100755 --- a/tools/fmt-diff.py +++ b/tools/fmt-diff.py
@@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # Copyright (c) 2020, the R8 project authors. Please see the AUTHORS file # for details. All rights reserved. Use of this source code is governed by a # BSD-style license that can be found in the LICENSE file. @@ -13,8 +13,10 @@ GOOGLE_JAVA_FORMAT_DIFF = os.path.join( utils.THIRD_PARTY, + 'google', 'google-java-format', - 'google-java-format-google-java-format-1.7', + '1.14.0', + 'google-java-format-1.14.0', 'scripts', 'google-java-format-diff.py')