Skip to content

Updated to google format version 1.8 #18

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
simonkarman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Updated to google format version 1.8 #18

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0dac805
Updated to google format version 1.8
simonkarman Jul 8, 2020
cbc4342
Added GJF_VERSION param
simonkarman Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
.cache
*.swp
.idea
*.iml
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions format-code.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
#!/usr/bin/env sh
GJF_VERSION=1.8
mkdir -p .cache
cd .cache
if [ ! -f google-java-format-1.7-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.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-$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.7-all-deps.jar --replace $changed_java_files
java -jar .cache/google-java-format-$GJF_VERSION-all-deps.jar --replace $changed_java_files