Skip to content

Commit

Permalink
some updates to spotless checks
Browse files Browse the repository at this point in the history
use latest version of spotless
ignore javadoc in spotless
use AOSP java formatting (four space indents)
  • Loading branch information
dejabot committed Nov 23, 2023
1 parent 0338893 commit 2545ff5
Showing 1 changed file with 8 additions and 3 deletions.
11 changes: 8 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
id 'java-library'
id 'maven-publish'
id "edu.wpi.first.GradleRIO" version "2023.4.3"
id 'com.diffplug.spotless' version '6.12.0'
id 'com.diffplug.spotless' version '6.22.0'
id 'com.google.protobuf' version '0.8.19'
}

Expand Down Expand Up @@ -145,7 +145,11 @@ wpi.sim.addDriverstation()
// in order to make them all available at runtime. Also adding the manifest so WPILib
// knows where to look for our Robot Class.
jar {
from { configurations.runtimeClasspath.collect { it.isDirectory() ? it : zipTree(it) } }
from {
configurations.runtimeClasspath.collect {
it.isDirectory() ? it : zipTree(it)
}
}
manifest edu.wpi.first.gradlerio.GradleRIOPlugin.javaManifest(ROBOT_MAIN_CLASS)
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
Expand Down Expand Up @@ -186,7 +190,8 @@ spotless {
exclude '**/build/**', '**/build-*/**'
}
toggleOffOn()
googleJavaFormat()
googleJavaFormat().formatJavadoc(false).aosp()
indentWithSpaces(4)
removeUnusedImports()
trimTrailingWhitespace()
endWithNewline()
Expand Down

0 comments on commit 2545ff5

Please sign in to comment.