Skip to content

Switch formatting to Spotless, ratcheted from the base branch - #102

Merged
dshadowwolf merged 1 commit into
master-2.0-1.21.1-neofrom
spotless-formatting
Nov 9, 2026
Merged

dshadowwolf merged 1 commit into
master-2.0-1.21.1-neofrom
spotless-formatting

Conversation

@dshadowwolf

Copy link
Copy Markdown
Collaborator

Replace the google-java-format task (which needed a hand-placed tools/gjf.jar) and scripts/group_imports.py with Spotless, set up as in Technomagy:

  • Eclipse JDT with a shared profile (gradle/java-formatter.xml): Google style with 4-space blocks and continuations, 100 columns.
  • A custom import-block step (gradle/import-blocks.gradle) with fixture tests (testImportBlocks, part of check). zone.moddev.* (library and companion) is the last block.
  • Ratcheted from origin/master-2.0-1.21.1-neo, so existing 2-space files are reformatted only when next edited. CI checks out full history for this.
  • spotlessCheck runs in check; ./gradlew format is an alias for spotlessApply.

Policy and VS Code setup are in docs/code-format.md.

Replace the google-java-format task (which needed a hand-placed tools/gjf.jar)
and scripts/group_imports.py with Spotless, set up as in Technomagy:

- Eclipse JDT with a shared profile (gradle/java-formatter.xml): Google style
  with 4-space blocks and continuations, 100 columns.
- A custom import-block step (gradle/import-blocks.gradle) with fixture tests
  (testImportBlocks, part of check). zone.moddev.* (library and companion) is
  the last block.
- Ratcheted from origin/master-2.0-1.21.1-neo, so existing 2-space files are
  reformatted only when next edited. CI checks out full history for this.
- spotlessCheck runs in check; `./gradlew format` is an alias for spotlessApply.

Policy and VS Code setup are in docs/code-format.md.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@dshadowwolf
dshadowwolf merged commit 622bd50 into master-2.0-1.21.1-neo Nov 9, 2026
5 checks passed
@dshadowwolf
dshadowwolf deleted the spotless-formatting branch November 10, 2026 14:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant