bump to 1.10.0, add jdk16 support

4 files changed, 26 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f532b4b48630..976962aaa3bc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,17 @@
 pkgbase = google-java-format
 	pkgdesc = Reformats Java source code to comply with Google Java Style
-	pkgver = 1.9
+	pkgver = 1.10.0
 	pkgrel = 1
 	url = https://github.com/google/google-java-format
 	arch = any
 	license = Apache
 	depends = java-runtime
-	source = https://github.com/google/google-java-format/releases/download/google-java-format-1.9/google-java-format-1.9-all-deps.jar
+	source = https://github.com/google/google-java-format/releases/download/v1.10.0/google-java-format-1.10.0-all-deps.jar
 	source = google-java-format
-	sha256sums = 1d98720a5984de85a822aa32a378eeacd4d17480d31cba6e730caae313466b97
-	sha256sums = c74d344403aa33281871c80fec01a0ac0e2413b88058bae780c3ae9c25d4be77
+	source = https://raw.githubusercontent.com/google/google-java-format/master/LICENSE
+	sha256sums = 9d404cf6fe5f6aa7672693a3301ef2a22016ba540eca5d835be43104b71eb5d6
+	sha256sums = fffd67f769a658dc33761f264ea6ac239200f028be2a0ab45739c83788e3fd57
+	sha256sums = 2c7e23c8000fe553b6f380b5e365dd72198439174f1b6821d5e3b190b54af0dc
 
 pkgname = google-java-format
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..018a3de08144
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!PKGBUILD
+!.SRCINFO
+!.gitignore
diff --git a/PKGBUILD b/PKGBUILD
index 8e3e51894c9c..2abcfad552de 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,24 @@
 # Maintainer: pumpkincheshire <sollyonzou@gmail.com>
 # Contributor:  <tigersoldi at gmail dot com>
 pkgname=google-java-format
-pkgver=1.9
+pkgver=1.10.0
 pkgrel=1
 pkgdesc="Reformats Java source code to comply with Google Java Style"
 arch=('any')
 url="https://github.com/google/google-java-format"
 license=('Apache')
-depends=('java-runtime')
+depends=('java-runtime' 'sh')
 options=()
-source=(https://github.com/google/google-java-format/releases/download/$pkgname-$pkgver/$pkgname-$pkgver-all-deps.jar
-        google-java-format)
-sha256sums=('1d98720a5984de85a822aa32a378eeacd4d17480d31cba6e730caae313466b97'
-            'c74d344403aa33281871c80fec01a0ac0e2413b88058bae780c3ae9c25d4be77')
+source=(https://github.com/google/google-java-format/releases/download/v$pkgver/$pkgname-$pkgver-all-deps.jar
+        google-java-format
+        https://raw.githubusercontent.com/google/google-java-format/master/LICENSE)
+sha256sums=('9d404cf6fe5f6aa7672693a3301ef2a22016ba540eca5d835be43104b71eb5d6'
+            'fffd67f769a658dc33761f264ea6ac239200f028be2a0ab45739c83788e3fd57'
+            '2c7e23c8000fe553b6f380b5e365dd72198439174f1b6821d5e3b190b54af0dc')
 
 
 package() {
   install -Dm755 "$srcdir/$pkgname-$pkgver-all-deps.jar" "$pkgdir/usr/share/java/$pkgname/$pkgname.jar"
   install -Dm755  "$srcdir/google-java-format" "$pkgdir/usr/bin/google-java-format"
+  install -Dm644 LICENSE* -t "$pkgdir/usr/share/licenses/$pkgname"
 }
diff --git a/google-java-format b/google-java-format
index 37bf78ce434f..5e45d0a8fd0f 100755
--- a/google-java-format
+++ b/google-java-format
@@ -1,2 +1,8 @@
 #!/bin/sh
-exec /usr/bin/java -jar '/usr/share/java/google-java-format/google-java-format.jar' "$@"
+exec 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 '/usr/share/java/google-java-format/google-java-format.jar' "$@"