diff options
| author | David Pursehouse <dpursehouse@collab.net> | 2019-01-31 15:30:14 +0900 |
|---|---|---|
| committer | David Pursehouse <dpursehouse@collab.net> | 2019-01-31 15:30:14 +0900 |
| commit | 36fc7dc56ac83b3f56a9f632166cb1b906c84c57 (patch) | |
| tree | 5b893653f6a5fb6bcac4d361836265860e63f826 | |
| parent | 96f9af8b177e37237116a9b7c2799f62cdec3dd7 (diff) | |
| parent | f78cf3e9f1d30610fc6e6e1dfd0bd3f78fe4b670 (diff) | |
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14:
dev-contributing.txt: Update google-java-format version to 1.6
Change-Id: I145db4574a369f910d37fe3966b3cefbf1b767d8
| -rw-r--r-- | Documentation/dev-contributing.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/dev-contributing.txt b/Documentation/dev-contributing.txt index 30b8126fa3..2f6de35233 100644 --- a/Documentation/dev-contributing.txt +++ b/Documentation/dev-contributing.txt @@ -164,7 +164,7 @@ Guide]. To format Java source code, Gerrit uses the link:https://github.com/google/google-java-format[`google-java-format`] -tool (version 1.5), and to format Bazel BUILD, WORKSPACE and .bzl files the +tool (version 1.6), and to format Bazel BUILD, WORKSPACE and .bzl files the link:https://github.com/bazelbuild/buildtools/tree/master/buildifier[`buildifier`] tool (version 0.17.2). These tools automatically apply format according to the style guides; this |