From 865b1a72ecbf56f0375435853f57b2ac4e0c0ed2 Mon Sep 17 00:00:00 2001 From: daltonfury42 Date: Fri, 5 Jun 2020 17:47:36 +0530 Subject: [PATCH 1/6] Use the list of files supplied by pre-commit --- README.md | 1 + format-code.sh | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 672aaa1..a1b98bd 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,7 @@ repos: sha: b7e9e7fcba4a5aea463e72fe9964c14877bd8130 hooks: - id: google-style-java + files: \.java$ ``` *Note*: this file stores Google's code style formatter jar in a `.cache/` diff --git a/format-code.sh b/format-code.sh index da44ba3..260a1b2 100755 --- a/format-code.sh +++ b/format-code.sh @@ -8,6 +8,4 @@ then 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.7-all-deps.jar --replace $@ From 9c63085cb6e2fbe26b62c8d6ca43228b9a1ff415 Mon Sep 17 00:00:00 2001 From: Gaurav Agarwal Date: Wed, 26 Jan 2022 09:11:04 +0530 Subject: [PATCH 2/6] updgrade the java code format version --- format-code.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/format-code.sh b/format-code.sh index 260a1b2..391ed80 100755 --- a/format-code.sh +++ b/format-code.sh @@ -1,11 +1,11 @@ #!/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.13.0-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/v1.13.0/google-java-format-1.13.0-all-deps.jar" + chmod 755 google-java-format-1.13.0-all-deps.jar fi cd .. -java -jar .cache/google-java-format-1.7-all-deps.jar --replace $@ +java -jar .cache/google-java-format-1.13.0-all-deps.jar --replace $@ From 4caf6b8b8686e003bf0529df89887e699edddd23 Mon Sep 17 00:00:00 2001 From: Debraj Manna Date: Wed, 14 Dec 2022 12:33:52 +0530 Subject: [PATCH 3/6] Support for jdk 17 --- format-code.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/format-code.sh b/format-code.sh index 391ed80..39cfc12 100755 --- a/format-code.sh +++ b/format-code.sh @@ -8,4 +8,15 @@ then fi cd .. -java -jar .cache/google-java-format-1.13.0-all-deps.jar --replace $@ +java \ +--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ +--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ +--add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \ +--add-exports jdk.compiler/com.sun.tools.javac.model=ALL-UNNAMED \ +--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ +--add-exports jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED \ +--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ +--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ +--add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ +--add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \ +-jar .cache/google-java-format-1.13.0-all-deps.jar --replace $@ From b7bb355957cb0a5c5174a47c491afc520995090c Mon Sep 17 00:00:00 2001 From: Debraj Manna Date: Wed, 14 Dec 2022 12:36:39 +0530 Subject: [PATCH 4/6] Update google format to 1.14 --- format-code.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/format-code.sh b/format-code.sh index 39cfc12..f7c6541 100755 --- a/format-code.sh +++ b/format-code.sh @@ -3,8 +3,8 @@ mkdir -p .cache cd .cache if [ ! -f google-java-format-1.13.0-all-deps.jar ] then - curl -LJO "https://github.com/google/google-java-format/releases/download/v1.13.0/google-java-format-1.13.0-all-deps.jar" - chmod 755 google-java-format-1.13.0-all-deps.jar + curl -LJO "https://github.com/google/google-java-format/releases/download/v1.14.0/google-java-format-1.14.0-all-deps.jar" + chmod 755 google-java-format-1.14.0-all-deps.jar fi cd .. From 16fd950354ec05e6f4a607fb0dabe13dfa41683f Mon Sep 17 00:00:00 2001 From: Debraj Manna Date: Wed, 14 Dec 2022 12:45:17 +0530 Subject: [PATCH 5/6] Fix version --- format-code.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/format-code.sh b/format-code.sh index f7c6541..372120e 100755 --- a/format-code.sh +++ b/format-code.sh @@ -1,7 +1,7 @@ #!/usr/bin/env sh mkdir -p .cache cd .cache -if [ ! -f google-java-format-1.13.0-all-deps.jar ] +if [ ! -f google-java-format-1.14.0-all-deps.jar ] then curl -LJO "https://github.com/google/google-java-format/releases/download/v1.14.0/google-java-format-1.14.0-all-deps.jar" chmod 755 google-java-format-1.14.0-all-deps.jar @@ -19,4 +19,4 @@ java \ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ --add-opens jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED \ --add-opens jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED \ --jar .cache/google-java-format-1.13.0-all-deps.jar --replace $@ +-jar .cache/google-java-format-1.14.0-all-deps.jar --replace $@ From 3929eea6a06555f0fd6aff6c80ef766577908659 Mon Sep 17 00:00:00 2001 From: Debraj Manna Date: Wed, 14 Dec 2022 12:55:18 +0530 Subject: [PATCH 6/6] Fix typo in add-exports option --- format-code.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/format-code.sh b/format-code.sh index 372120e..aaed554 100755 --- a/format-code.sh +++ b/format-code.sh @@ -8,7 +8,7 @@ then fi cd .. -java \ +java \ --add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED \