Skip to content

Commit 0f7274e

Browse files
authored
Quick fix for spotless (#324)
1 parent ceae489 commit 0f7274e

File tree

3 files changed

+43
-17
lines changed

3 files changed

+43
-17
lines changed

.mvn/jvm.config

Lines changed: 0 additions & 5 deletions
This file was deleted.

CONTRIBUTING.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,20 @@ the `dev` profile in your Maven command to use those artifacts instead of buildi
2121
Modifying the native op generation code (not the annotation processor) or the JavaCPP configuration (not the abstract Pointers) will require a
2222
complete build could be required to reflect the changes, otherwise `-Pdev` should be fine.
2323

24+
## JDK 16+
25+
26+
If you're using JDK 16+, you need to add some exports for the formatter plugin:
27+
28+
```
29+
--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED
30+
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED
31+
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED
32+
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED
33+
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
34+
```
35+
36+
This can be done in `.mvn/jvm.config` or `MAVEN_OPTS`.
37+
2438
### Native Builds
2539

2640
In some cases, like when adding GPU support or re-generating op classes, you will need to re-build the native library. 99% of this is building

pom.xml

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<maven.javadoc.skip>true</maven.javadoc.skip>
4545
<maven.source.skip>true</maven.source.skip>
4646
<gpg.skip>true</gpg.skip>
47-
<spotless.version>2.10.3</spotless.version>
47+
<spotless.version>2.11.1</spotless.version>
4848
</properties>
4949

5050
<repositories>
@@ -229,6 +229,33 @@
229229
</plugins>
230230
</build>
231231
</profile>
232+
233+
<profile>
234+
<id>format</id>
235+
<activation>
236+
<jdk>(,16)</jdk>
237+
</activation>
238+
<build>
239+
<plugins>
240+
<plugin>
241+
<groupId>com.diffplug.spotless</groupId>
242+
<artifactId>spotless-maven-plugin</artifactId>
243+
<version>${spotless.version}</version>
244+
245+
<executions>
246+
<execution>
247+
<!-- Runs in initialize phase to fail fast in case of formatting issues (should be before codegen).-->
248+
<id>spotless-check</id>
249+
<phase>initialize</phase>
250+
<goals>
251+
<goal>check</goal>
252+
</goals>
253+
</execution>
254+
</executions>
255+
</plugin>
256+
</plugins>
257+
</build>
258+
</profile>
232259
</profiles>
233260

234261
<!-- http://central.sonatype.org/pages/requirements.html#developer-information -->
@@ -305,6 +332,7 @@
305332
<artifactId>spotless-maven-plugin</artifactId>
306333
<version>${spotless.version}</version>
307334
<configuration>
335+
308336
<ratchetFrom>origin/master</ratchetFrom>
309337

310338
<lineEndings/>
@@ -318,17 +346,6 @@
318346
</licenseHeader>
319347
</java>
320348
</configuration>
321-
322-
<executions>
323-
<execution>
324-
<!-- Runs in initialize phase to fail fast in case of formatting issues (should be before codegen).-->
325-
<id>spotless-check</id>
326-
<phase>initialize</phase>
327-
<goals>
328-
<goal>check</goal>
329-
</goals>
330-
</execution>
331-
</executions>
332349
</plugin>
333350
</plugins>
334351
<pluginManagement>

0 commit comments

Comments
 (0)