Update pipelines command

zelytra · Sep 21, 2024 · e6e1079 · e6e1079
1 parent 31ecfab
commit e6e1079
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -21,4 +21,4 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build with Gradle
-        run: ./gradlew build
+        run: ./gradlew clean build spotlessApply
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -21,4 +21,4 @@ jobs:
         run: chmod +x ./gradlew
 
       - name: Build with Gradle
-        run: ./gradlew spotlessCheck
+        run: ./gradlew clean build spotlessCheck
diff --git a/build.gradle b/build.gradle
@@ -1,17 +1,6 @@
-buildscript {
-    repositories {
-        maven {
-            url = uri("https://plugins.gradle.org/m2/")
-        }
-    }
-    dependencies {
-        classpath("com.diffplug.spotless:spotless-plugin-gradle:7.0.0.BETA2")
-    }
-}
-
 plugins {
     id 'java'
-    id("com.diffplug.spotless") version "7.0.0.BETA2"
+    id 'com.diffplug.spotless' version '6.25.0'
 }
 
 group = 'fr.zelytra'
@@ -45,18 +34,6 @@ dependencies {
     implementation 'com.mojang:authlib:1.5.21' // Authlib dependency for GameProfile
 }
 
-spotless {
-    java {
-        target 'src/main/java/**/*.java', 'src/test/java/**/*.java'
-        importOrder()
-        removeUnusedImports()
-        cleanthat()
-        trimTrailingWhitespace()
-        formatAnnotations()
-        eclipse()
-    }
-}
-
 def targetJavaVersion = 21
 java {
     def javaVersion = JavaVersion.toVersion(targetJavaVersion)
@@ -67,6 +44,20 @@ java {
     }
 }
 
+spotless {
+    java {
+        target fileTree('.') {
+            include '**/*.java'
+            exclude '**/build/**', '**/build-*/**'
+        }
+        toggleOffOn()
+        eclipse()
+        removeUnusedImports()
+        trimTrailingWhitespace()
+        endWithNewline()
+    }
+}
+
 tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +0,0 @@
-org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
-  --add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED