From e913fb96fc04c4a16ce5dc125ec3c4178cffeae2 Mon Sep 17 00:00:00 2001 From: Jon Caldwell Date: Thu, 24 Jun 2021 14:01:29 -0500 Subject: [PATCH 1/2] Support JDK 16 --- format-code.sh | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/format-code.sh b/format-code.sh index da44ba3..6cd924a 100755 --- a/format-code.sh +++ b/format-code.sh @@ -1,13 +1,19 @@ #!/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.10.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.10.0/google-java-format-1.10.0-all-deps.jar" + chmod 755 google-java-format-1.10.0-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 \ + --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.parser=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ + --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ + -jar .cache/google-java-format-1.10.0-all-deps.jar --replace $changed_java_files From 728d08baaeea32061ec7799507ae3abcabad3142 Mon Sep 17 00:00:00 2001 From: Jon Caldwell Date: Mon, 16 May 2022 16:05:19 -0500 Subject: [PATCH 2/2] Use newer version of jar --- format-code.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/format-code.sh b/format-code.sh index 6cd924a..6b96144 100755 --- a/format-code.sh +++ b/format-code.sh @@ -1,13 +1,14 @@ #!/usr/bin/env sh mkdir -p .cache cd .cache -if [ ! -f google-java-format-1.10.0-all-deps.jar ] +if [ ! -f google-java-format-1.15.0-all-deps.jar ] then - curl -LJO "https://github.com/google/google-java-format/releases/download/v1.10.0/google-java-format-1.10.0-all-deps.jar" - chmod 755 google-java-format-1.10.0-all-deps.jar + curl -LJO "https://github.com/google/google-java-format/releases/download/v1.15.0/google-java-format-1.15.0-all-deps.jar" + chmod 755 google-java-format-1.15.0-all-deps.jar fi cd .. - +echo -n "Java version..." +java --version changed_java_files=$(git diff --cached --name-only --diff-filter=ACMR | grep ".*java$" ) echo $changed_java_files java \ @@ -16,4 +17,4 @@ java \ --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \ --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \ - -jar .cache/google-java-format-1.10.0-all-deps.jar --replace $changed_java_files + -jar .cache/google-java-format-1.15.0-all-deps.jar --replace $changed_java_files