Skip to content

Commit ef219c0

Browse files
committed
Remove workarounds to #834 because they are no longer needed thanks to #1224 and #1228.
1 parent 56b0ec9 commit ef219c0

File tree

2 files changed

+0
-52
lines changed

2 files changed

+0
-52
lines changed

plugin-gradle/README.md

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -197,21 +197,6 @@ spotless {
197197
formatAnnotations()
198198
```
199199

200-
**⚠️ Note on using Google Java Format with Java 16+**
201-
202-
Using Java 16+ with Google Java Format 1.10.0 [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) to the running JDK.
203-
These Flags can be provided using the `gradle.properties` file (See [documentation](https://docs.gradle.org/current/userguide/build_environment.html)).
204-
205-
For example the following file under `gradle.properties` will run gradle with the required flags:
206-
```
207-
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
208-
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
209-
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
210-
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
211-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
212-
```
213-
This is a workaround to a [pending issue](https://github.com/diffplug/spotless/issues/834).
214-
215200
### palantir-java-format
216201

217202
[homepage](https://github.com/palantir/palantir-java-format). [changelog](https://github.com/palantir/palantir-java-format/releases).
@@ -225,21 +210,6 @@ spotless {
225210
formatAnnotations()
226211
```
227212

228-
**⚠️ Note on using Palantir Java Format with Java 16+**
229-
230-
Using Java 16+ with Palantir Java Format [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) on the running JDK.
231-
These Flags can be provided using the `gradle.properties` file (See [documentation](https://docs.gradle.org/current/userguide/build_environment.html)).
232-
233-
For example the following file under `gradle.properties` will run gradle with the required flags:
234-
```
235-
org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
236-
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
237-
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
238-
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
239-
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
240-
```
241-
This is a workaround to a [pending issue](https://github.com/diffplug/spotless/issues/834).
242-
243213
### eclipse jdt
244214

245215
[homepage](https://www.eclipse.org/downloads/packages/). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter). See [here](../ECLIPSE_SCREENSHOTS.md) for screenshots that demonstrate how to get and install the config file mentioned below.

plugin-maven/README.md

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -214,17 +214,6 @@ any other maven phase (i.e. compile) then it can be configured as below;
214214
</googleJavaFormat>
215215
```
216216

217-
**⚠️ Note on using Google Java Format with Java 16+**
218-
219-
Using Java 16+ with Google Java Format 1.10.0 [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) to the running JDK.
220-
These Flags can be provided using `MAVEN_OPTS` environment variable or using the `./mvn/jvm.config` file (See [documentation](https://maven.apache.org/configure.html#mvn-jvm-config-file)).
221-
222-
For example the following file under `.mvn/jvm.config` will run maven with the required flags:
223-
```
224-
--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
225-
```
226-
This is a workaround to a [pending issue](https://github.com/diffplug/spotless/issues/834).
227-
228217
### palantir-java-format
229218

230219
[homepage](https://github.com/palantir/palantir-java-format). [changelog](https://github.com/palantir/palantir-java-format/releases). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/PalantirJavaFormat.java).
@@ -235,17 +224,6 @@ This is a workaround to a [pending issue](https://github.com/diffplug/spotless/i
235224
</palantirJavaFormat>
236225
```
237226

238-
**⚠️ Note on using Palantir Java Format with Java 16+**
239-
240-
Using Java 16+ with Palantir Java Format [requires additional flags](https://github.com/google/google-java-format/releases/tag/v1.10.0) on the running JDK.
241-
These Flags can be provided using `MAVEN_OPTS` environment variable or using the `./mvn/jvm.config` file (See [documentation](https://maven.apache.org/configure.html#mvn-jvm-config-file)).
242-
243-
For example the following file under `.mvn/jvm.config` will run maven with the required flags:
244-
```
245-
--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
246-
```
247-
This is a workaround to a [pending issue](https://github.com/diffplug/spotless/issues/834).
248-
249227
### eclipse jdt
250228

251229
[homepage](https://www.eclipse.org/downloads/packages/). [compatible versions](https://github.com/diffplug/spotless/tree/main/lib-extra/src/main/resources/com/diffplug/spotless/extra/eclipse_jdt_formatter). [code](https://github.com/diffplug/spotless/blob/main/plugin-maven/src/main/java/com/diffplug/spotless/maven/java/Eclipse.java). See [here](../ECLIPSE_SCREENSHOTS.md) for screenshots that demonstrate how to get and install the config file mentioned below.

0 commit comments

Comments
 (0)