Switch to Spotless and adapt to upstream changes (#62)

PGMDev · Jun 23, 2024 · 0b56b38 · 0b56b38
1 parent 5d7f730
commit 0b56b38
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 12 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -10,11 +10,13 @@ jobs:
     steps:
       - name: checkout
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: setup
         uses: actions/setup-java@v4
         with:
-          java-version: 8
-          distribution: adopt
+          java-version: 21
+          distribution: temurin
           cache: maven
       - name: build
         run: mvn install

diff --git a/pom.xml b/pom.xml
@@ -8,8 +8,8 @@
     <url>https://pgm.dev</url>
 
     <properties>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.mainClass>dev.pgm.community.Community</project.mainClass>
         <project.author>applenick</project.author>
@@ -115,21 +115,21 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.13.0</version>
                 <configuration>
                     <annotationProcessorPaths>
                         <path>
-                            <groupId>cloud.commandframework</groupId>
+                            <groupId>org.incendo</groupId>
                             <artifactId>cloud-annotations</artifactId>
-                            <version>1.8.2</version>
+                            <version>2.0.0-rc.2</version>
                         </path>
                     </annotationProcessorPaths>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
+                <version>3.6.0</version>
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <minimizeJar>true</minimizeJar>
@@ -184,11 +184,19 @@
 
             <!-- Validates that code is properly formatted with Google's code style -->
             <plugin>
-                <groupId>com.coveo</groupId>
-                <artifactId>fmt-maven-plugin</artifactId>
-                <version>2.9</version>
+                <groupId>com.diffplug.spotless</groupId>
+                <artifactId>spotless-maven-plugin</artifactId>
+                <version>2.43.0</version>
                 <configuration>
-                    <style>google</style>
+                    <ratchetFrom>origin/dev</ratchetFrom>
+                    <java>
+                        <removeUnusedImports/>
+                        <palantirJavaFormat>
+                            <version>2.47.0</version>
+                            <style>GOOGLE</style>
+                            <formatJavadoc>true</formatJavadoc>
+                        </palantirJavaFormat>
+                    </java>
                 </configuration>
                 <executions>
                     <execution>