From 985c12aadefa1471c1cbea70875ec8bf5d8e24b7 Mon Sep 17 00:00:00 2001 From: tison Date: Sat, 11 Jun 2022 09:24:02 +0800 Subject: [PATCH] Upgrade spotless version and remove jvmargs workaround Signed-off-by: tison --- build.gradle | 2 +- gradle.properties | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index 5d1c29a5dfe1c..bd9f97ceac4ae 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ buildscript { plugins { id 'base' id 'pmd' - id 'com.diffplug.spotless' version '6.0.0' + id 'com.diffplug.spotless' version '6.7.1' id 'com.github.hierynomus.license' version '0.16.1' id 'com.github.spotbugs' version '5.0.6' id 'version-catalog' diff --git a/gradle.properties b/gradle.properties index 391263417d055..f688779de9056 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,7 @@ org.gradle.parallel=true -# add-exports are needed for spotless to work on Java 17 -org.gradle.jvmargs=-Xmx4g -Xss4m --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 +org.gradle.jvmargs=-Xmx4g -Xss4m org.gradle.caching=true # Note, this might have issues on the normal Github runner.