From 0dac805c49732aa56e5b315e889e23e73d4e8c4a Mon Sep 17 00:00:00 2001 From: Simon Karman Date: Wed, 8 Jul 2020 09:57:01 +0200 Subject: [PATCH 1/2] Updated to google format version 1.8 --- format-code.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/format-code.sh b/format-code.sh index da44ba3..a322686 100755 --- a/format-code.sh +++ b/format-code.sh @@ -1,13 +1,13 @@ #!/usr/bin/env sh mkdir -p .cache cd .cache -if [ ! -f google-java-format-1.7-all-deps.jar ] +if [ ! -f google-java-format-1.8-all-deps.jar ] then - curl -LJO "https://github.com/google/google-java-format/releases/download/google-java-format-1.7/google-java-format-1.7-all-deps.jar" - chmod 755 google-java-format-1.7-all-deps.jar + curl -LJO "https://github.com/google/google-java-format/releases/download/google-java-format-1.8/google-java-format-1.8-all-deps.jar" + chmod 755 google-java-format-1.8-all-deps.jar fi cd .. changed_java_files=$(git diff --cached --name-only --diff-filter=ACMR | grep ".*java$" ) echo $changed_java_files -java -jar .cache/google-java-format-1.7-all-deps.jar --replace $changed_java_files +java -jar .cache/google-java-format-1.8-all-deps.jar --replace $changed_java_files From cbc43422f3656526b3e5d4f82d8ea57bef605ad5 Mon Sep 17 00:00:00 2001 From: Simon Karman Date: Wed, 8 Jul 2020 10:06:56 +0200 Subject: [PATCH 2/2] Added GJF_VERSION param --- .gitignore | 2 ++ README.md | 2 +- format-code.sh | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index fc16c75..e457817 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,4 @@ .cache *.swp +.idea +*.iml diff --git a/README.md b/README.md index 672aaa1..dedc254 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ code style formatter for you on your code! Usage: -``` +```yaml repos: - repo: https://github.com/maltzj/google-style-precommit-hook sha: b7e9e7fcba4a5aea463e72fe9964c14877bd8130 diff --git a/format-code.sh b/format-code.sh index a322686..b8e6e9d 100755 --- a/format-code.sh +++ b/format-code.sh @@ -1,13 +1,13 @@ #!/usr/bin/env sh +GJF_VERSION=1.8 mkdir -p .cache cd .cache -if [ ! -f google-java-format-1.8-all-deps.jar ] +if [ ! -f google-java-format-$GJF_VERSION-all-deps.jar ] then - curl -LJO "https://github.com/google/google-java-format/releases/download/google-java-format-1.8/google-java-format-1.8-all-deps.jar" - chmod 755 google-java-format-1.8-all-deps.jar + curl -LJO "https://github.com/google/google-java-format/releases/download/google-java-format-$GJF_VERSION/google-java-format-$GJF_VERSION-all-deps.jar" fi cd .. changed_java_files=$(git diff --cached --name-only --diff-filter=ACMR | grep ".*java$" ) echo $changed_java_files -java -jar .cache/google-java-format-1.8-all-deps.jar --replace $changed_java_files +java -jar .cache/google-java-format-$GJF_VERSION-all-deps.jar --replace $changed_java_files