Commit 42559015 authored by AnimeGitB's avatar AnimeGitB
Browse files

Spotless code autoformatting

parent f1b63c56
...@@ -6,7 +6,6 @@ on: ...@@ -6,7 +6,6 @@ on:
- "**.java" - "**.java"
branches: branches:
- "stable" - "stable"
- "development"
pull_request: pull_request:
paths: paths:
- "**.java" - "**.java"
......
name: "Lint and Build"
on:
workflow_dispatch: ~
push:
paths:
- "**.java"
branches:
- "development"
jobs:
Build-Server-Jar:
runs-on: ubuntu-latest
steps:
- name: Checkout LintRatchet
uses: actions/checkout@v2
with:
ref: LintRatchet
- name: Checkout branch
uses: actions/checkout@v2
- name: Setup Java
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: '17'
- name: Cache gradle files
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
./.gradle/loom-cache
key: ${{ runner.os }}-gradle-${{ hashFiles('*.gradle', 'gradle.properties', '**/*.accesswidener') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Run Spotless
run: ./gradlew spotlessApply
- name: Run Gradle
run: ./gradlew && ./gradlew jar
- name: Upload build
uses: actions/upload-artifact@v3
with:
name: Grasscutter
path: grasscutter-*.jar
- name: Commit any Spotless changes
uses: EndBug/add-and-commit@v9
with:
add: '-u'
default_author: github_actions
message: 'Fix whitespace'
...@@ -34,6 +34,9 @@ plugins { ...@@ -34,6 +34,9 @@ plugins {
// Maven // Maven
id 'maven-publish' id 'maven-publish'
id 'signing' id 'signing'
// Spotless formatter
id "com.diffplug.spotless" version "6.8.0"
} }
compileJava.options.encoding = "UTF-8" compileJava.options.encoding = "UTF-8"
...@@ -93,8 +96,8 @@ dependencies { ...@@ -93,8 +96,8 @@ dependencies {
compileOnly 'org.projectlombok:lombok:1.18.24' compileOnly 'org.projectlombok:lombok:1.18.24'
annotationProcessor 'org.projectlombok:lombok:1.18.24' annotationProcessor 'org.projectlombok:lombok:1.18.24'
testCompileOnly 'org.projectlombok:lombok:1.18.24' testCompileOnly 'org.projectlombok:lombok:1.18.24'
testAnnotationProcessor 'org.projectlombok:lombok:1.18.24' testAnnotationProcessor 'org.projectlombok:lombok:1.18.24'
} }
configurations.all { configurations.all {
...@@ -238,6 +241,30 @@ eclipse { ...@@ -238,6 +241,30 @@ eclipse {
} }
} }
spotless {
// optional: limit format enforcement to just the files changed by this feature branch
ratchetFrom 'LintRatchet'
format 'misc', {
// define the files to apply `misc` to
target '*.gradle', '*.md', '.gitignore'
// define the steps to apply to those files
trimTrailingWhitespace()
indentWithSpaces() // or spaces. Takes an integer argument if you don't like 4
endWithNewline()
}
java {
// don't need to set target, it is inferred from java
// define the steps to apply to those files
trimTrailingWhitespace()
indentWithSpaces() // or spaces. Takes an integer argument if you don't like 4
endWithNewline()
replaceRegex('Force one space between if/etc. and ( or {', '(?<=\\b(?:if|for|while|switch|try|else|catch|finally|synchronized)) *(?=[\\(\\{])', ' ')
replaceRegex('Force one space between ) and {', '\\) *\\{(?!\\})', ') {')
}
}
signing { signing {
if(!version.endsWith('-dev')) { if(!version.endsWith('-dev')) {
sign publishing.publications.mavenJava sign publishing.publications.mavenJava
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment