summaryrefslogtreecommitdiff
path: root/git_hooks
diff options
context:
space:
mode:
authorGeorge Fraser <george@fivetran.com>2018-05-21 09:49:24 -0700
committerGeorge Fraser <george@fivetran.com>2018-05-21 09:49:24 -0700
commit9e3e8abe71fe12d1757fbf91e4f0db13cc23ced8 (patch)
treef8f9d6bb906b5f574240ec17673412c13a3b8ec2 /git_hooks
parentfcb1bf1847a58e8dc5cf20f1af2554a54bc4d39b (diff)
downloadjava-language-server-9e3e8abe71fe12d1757fbf91e4f0db13cc23ced8.zip
Change to width 120
Diffstat (limited to 'git_hooks')
-rw-r--r--git_hooks/google-java-format-1.3-all-deps.jarbin6669662 -> 0 bytes
-rw-r--r--git_hooks/google-java-format-1.6-SNAPSHOT-all-deps.jarbin0 -> 5729857 bytes
-rwxr-xr-xgit_hooks/pre-commit2
3 files changed, 1 insertions, 1 deletions
diff --git a/git_hooks/google-java-format-1.3-all-deps.jar b/git_hooks/google-java-format-1.3-all-deps.jar
deleted file mode 100644
index 859a3ca..0000000
--- a/git_hooks/google-java-format-1.3-all-deps.jar
+++ /dev/null
Binary files differ
diff --git a/git_hooks/google-java-format-1.6-SNAPSHOT-all-deps.jar b/git_hooks/google-java-format-1.6-SNAPSHOT-all-deps.jar
new file mode 100644
index 0000000..72be68f
--- /dev/null
+++ b/git_hooks/google-java-format-1.6-SNAPSHOT-all-deps.jar
Binary files differ
diff --git a/git_hooks/pre-commit b/git_hooks/pre-commit
index 0cb5c33..bc98c81 100755
--- a/git_hooks/pre-commit
+++ b/git_hooks/pre-commit
@@ -35,7 +35,7 @@ else
stored_staged_changes=false
fi
-formatter_jar="${root_dir}/${jar_base_dir}/google-java-format-1.3-all-deps.jar"
+formatter_jar="${root_dir}/${jar_base_dir}/google-java-format-1.6-SNAPSHOT-all-deps.jar"
formatter_cmd="java -jar ${formatter_jar}"
# Format file in-place and use 4-space style (AOSP).
formatter_args="--replace --aosp"