summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorDavid Pursehouse <dpursehouse@collab.net>2019-02-20 10:54:43 +0900
committerDavid Pursehouse <dpursehouse@collab.net>2019-02-20 10:54:43 +0900
commitb0f5b17be739c6f559eec669168978727d79673b (patch)
tree8e0344ba2f990971793b800c37c835a91f902bd2 /tools
parent52ee3af5b560c337247971ac9c2cb5f042cfd45a (diff)
parentb780f23fdcf1cebb7e2f424ba39c1680013e1c9a (diff)
Merge branch 'stable-2.14' into stable-2.15
* stable-2.14: setup_gjf.sh: Add support for version 1.7 Change-Id: Ibf258f496cbfd7c6573350ce0d52747f5e406641
Diffstat (limited to 'tools')
-rwxr-xr-xtools/setup_gjf.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/setup_gjf.sh b/tools/setup_gjf.sh
index de2e0cc6db..c450811f62 100755
--- a/tools/setup_gjf.sh
+++ b/tools/setup_gjf.sh
@@ -29,6 +29,9 @@ case "$VERSION" in
1.6)
SHA1="02b3e84e52d2473e2c4868189709905a51647d03"
;;
+1.7)
+ SHA1="b6d34a51e579b08db7c624505bdf9af4397f1702"
+ ;;
*)
echo "unknown google-java-format version: $VERSION"
exit 1