Skip to content

Commit

Permalink
Support JDK 17
Browse files Browse the repository at this point in the history
Analogous to maltzj#22  :
* Update to latest `google-java-format-1.12.0-all-deps.jar` to support JDK 17 language features.
* Update `java` command to comply with [JEP 261: Module System](https://openjdk.java.net/jeps/261) updates to run with strict encapsulation by default.
  • Loading branch information
bauerjs1 authored Nov 8, 2021
1 parent 95c2f56 commit cb7c169
Showing 1 changed file with 14 additions and 4 deletions.
18 changes: 14 additions & 4 deletions format-code.sh
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
#!/usr/bin/env sh

VERSION=1.12.0
JARFILE=google-java-format-$VERSION-all-deps.jar

mkdir -p .cache
cd .cache
if [ ! -f google-java-format-1.7-all-deps.jar ]
if [ ! -f $JARFILE ]
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/v$VERSION/$JARFILE"
chmod 755 $JARFILE
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/$JARFILE --replace $changed_java_files

0 comments on commit cb7c169

Please sign in to comment.