Skip to content

Commit ad2f3ca

Browse files
committed
Reorder section about Groovy integration
1 parent 81c3511 commit ad2f3ca

File tree

2 files changed

+10
-7
lines changed

2 files changed

+10
-7
lines changed

plugin-gradle/README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -322,13 +322,16 @@ spotless {
322322
importOrderFile('eclipse-import-order.txt') // import order file as exported from eclipse
323323
// removes semicolons at the end of lines
324324
removeSemicolons()
325-
326-
excludeJava() // excludes all Java sources within the Groovy source dirs from formatting
327325
// the Groovy Eclipse formatter extends the Java Eclipse formatter,
328326
// so it formats Java files by default (unless `excludeJava` is used).
329327
greclipse() // has its own section below
328+
329+
licenseHeader('/* (C) $YEAR */') // or licenseHeaderFile
330330
331-
licenseHeader '/* (C) $YEAR */' // or licenseHeaderFile
331+
//---- Below is for `groovy` only ----
332+
333+
// excludes all Java sources within the Groovy source dirs from formatting
334+
excludeJava()
332335
}
333336
groovyGradle {
334337
target '*.gradle' // default target of groovyGradle

plugin-maven/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -331,16 +331,16 @@ These mechanisms already exist for the Gradle plugin.
331331
<include>src/test/groovy/**/*.groovy</include>
332332
</includes>
333333

334-
<importOrder /> <!-- standard import order -->
334+
<importOrder/> <!-- standard import order -->
335335
<importOrder> <!-- or a custom ordering -->
336336
<order>java|javax,org,com,com.diffplug,,\#com.diffplug,\#</order> <!-- or use <file>${project.basedir}/eclipse.importorder</file> -->
337337
<!-- you can use an empty string for all the imports you didn't specify explicitly, '|' to join group without blank line, and '\#` prefix for static imports. -->
338338
</importOrder>
339339

340-
<removeSemicolons /> <!-- removes semicolons at the end of lines -->
341-
342-
<greclipse /> <!-- has its own section below -->
340+
<removeSemicolons/> <!-- removes semicolons at the end of lines -->
341+
<greclipse/> <!-- has its own section below -->
343342

343+
<excludeJava/>
344344
<licenseHeader>
345345
<content>/* (C)$YEAR */</content> <!-- or <file>${project.basedir}/license-header</file> -->
346346
</licenseHeader>

0 commit comments

Comments
 (0)