diff --git a/build.gradle b/build.gradle index d2b99db..8eb5ab3 100644 --- a/build.gradle +++ b/build.gradle @@ -135,11 +135,14 @@ gversion { indent = " " } +// Spotless formatting +project.compileJava.dependsOn(spotlessApply) spotless { + enforceCheck false java { - target fileTree('.') { - include '**/*.java' - exclude '**/build/**', '**/build-*/**' + target fileTree(".") { + include "**/*.java" + exclude "**/build/**", "**/build-*/**" } toggleOffOn() googleJavaFormat() @@ -148,29 +151,19 @@ spotless { endWithNewline() } groovyGradle { - target fileTree('.') { - include '**/*.gradle' - exclude '**/build/**', '**/build-*/**' + target fileTree(".") { + include "**/*.gradle" + exclude "**/build/**", "**/build-*/**" } greclipse() indentWithSpaces(4) trimTrailingWhitespace() endWithNewline() } - format 'xml', { - target fileTree('.') { - include '**/*.xml' - exclude '**/build/**', '**/build-*/**' - } - eclipseWtp('xml') - trimTrailingWhitespace() - indentWithSpaces(2) - endWithNewline() - } - format 'misc', { - target fileTree('.') { - include '**/*.md', '**/.gitignore' - exclude '**/build/**', '**/build-*/**' + format "misc", { + target fileTree(".") { + include "**/*.md", "**/.gitignore" + exclude "**/build/**", "**/build-*/**" } trimTrailingWhitespace() indentWithSpaces(2) diff --git a/src/main/java/frc/robot/BuildConstants.java b/src/main/java/frc/robot/BuildConstants.java index f1fd325..6336836 100644 --- a/src/main/java/frc/robot/BuildConstants.java +++ b/src/main/java/frc/robot/BuildConstants.java @@ -5,12 +5,12 @@ public final class BuildConstants { public static final String MAVEN_GROUP = ""; public static final String MAVEN_NAME = "Forte-2-5"; public static final String VERSION = "unspecified"; - public static final int GIT_REVISION = 57; - public static final String GIT_SHA = "3bce2b6cdf6012df5e1c4645e0fb0e2b16b02ffd"; - public static final String GIT_DATE = "2024-10-10 17:55:55 EDT"; - public static final String GIT_BRANCH = "pivot2"; - public static final String BUILD_DATE = "2024-10-10 22:49:28 EDT"; - public static final long BUILD_UNIX_TIME = 1728614968375L; + public static final int GIT_REVISION = 79; + public static final String GIT_SHA = "547f9ab3941b5f47c4860c630df2611586daa420"; + public static final String GIT_DATE = "2024-10-11 09:43:51 EDT"; + public static final String GIT_BRANCH = "main"; + public static final String BUILD_DATE = "2024-10-11 09:50:21 EDT"; + public static final long BUILD_UNIX_TIME = 1728654621885L; public static final int DIRTY = 1; private BuildConstants() {} diff --git a/src/main/java/frc/robot/subsystems/drive/Drive.java b/src/main/java/frc/robot/subsystems/drive/Drive.java index 638bb15..6f90523 100644 --- a/src/main/java/frc/robot/subsystems/drive/Drive.java +++ b/src/main/java/frc/robot/subsystems/drive/Drive.java @@ -13,8 +13,6 @@ package frc.robot.subsystems.drive; -import static edu.wpi.first.units.Units.*; - import com.google.common.collect.Streams; import edu.wpi.first.math.geometry.Rotation2d; import edu.wpi.first.math.geometry.Translation2d;