Fix spotless setup

Author: prdoyle

.github/workflows/build-and-test.yml

@@ -30,9 +30,9 @@ jobs:
           # First version is for Bosk to use, and the second is for Gradle
           java-version: |
             25
-            17
+            25
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v5
         with:
           cache-read-only: false # OR: ${{ github.ref != 'refs/heads/develop' }}
 

build.gradle

@@ -138,32 +138,36 @@ configure(subprojects.findAll { it.name.startsWith("bosk-") || it.name == "boson
 	}
 }
 
-// TODO: Spotless currently isn't doing anything and I can't figure out why
-spotless {
-	enforceCheck = false
-	java {
-		importOrder '', '\\#' // Static imports after regular imports, as per mt-server standard and IntelliJ default
-		removeUnusedImports()
-		trimTrailingWhitespace()
-		leadingSpacesToTabs()
-		replaceRegex 'class-level javadoc indentation fix', /^\*/, ' *'
-		replaceRegex 'method-level javadoc indentation fix', /\t\*/, '\t *'
-	}
-	format 'gradle', {
-		target '**/*.gradle'
+// Spotless configuration
+subprojects {
+	apply plugin: 'com.diffplug.spotless'
+	spotless {
+		java {
+			importOrder '', '\\#' // Static imports after regular imports, as per mt-server standard and IntelliJ default
+			removeUnusedImports()
+			expandWildcardImports()
+			forbidModuleImports()
+			trimTrailingWhitespace()
+			leadingSpacesToTabs()
+			replaceRegex 'class-level javadoc indentation fix', /^\*/, ' *'
+			replaceRegex 'method-level javadoc indentation fix', /\t\*/, '\t *'
+		}
+		format 'gradle', {
+			target '**/*.gradle'
 
-		trimTrailingWhitespace()
-		leadingSpacesToTabs()
-		endWithNewline()
-	}
-	format 'misc', {
-		target '**/*.md', '**/.gitignore'
-
-		trimTrailingWhitespace()
-		//leadingSpacesToTabs() For markdown, we want to align some code examples very carefully, so we use spaces
-		replaceRegex 'class-level javadoc indentation fix', /^\*/, ' *'
-		replaceRegex 'method-level javadoc indentation fix', /\t\*/, '\t *'
-		endWithNewline()
+			trimTrailingWhitespace()
+			leadingSpacesToTabs()
+			endWithNewline()
+		}
+		format 'misc', {
+			target '**/*.md', '**/.gitignore'
+
+			trimTrailingWhitespace()
+			//leadingSpacesToTabs() For markdown, we want to align some code examples very carefully, so we use spaces
+			replaceRegex 'class-level javadoc indentation fix', /^\*/, ' *'
+			replaceRegex 'method-level javadoc indentation fix', /\t\*/, '\t *'
+			endWithNewline()
+		}
 	}
 }