Merge pull request #43 from syxc/kotlin-2.0

Update spotless.gradle
syxc · Jul 4, 2024 · 8f16076 · 8f16076
2 parents 41fd426 + 68f9c51
commit 8f16076
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/spotless/spotless.gradle b/spotless/spotless.gradle
@@ -5,16 +5,20 @@ def ktlintVersion = "1.3.1"
 
 spotless {
   java {
-    target '**/*.java'
+    target("**/*.java")
     targetExclude("**/build/**/*.java", "${rootProject.rootDir}/spotless/**")
-    toggleOffOn('@formatter:off', '@formatter:on')
+    toggleOffOn("@formatter:off", "@formatter:on")
+    importOrder()
+    removeUnusedImports()
+    trimTrailingWhitespace()
+    endWithNewline()
     // https://github.com/palantir/palantir-java-format
     palantirJavaFormat("2.47.0").style("GOOGLE").formatJavadoc(true)
-    removeUnusedImports()
+    formatAnnotations()
   }
 
   kotlin {
-    target "**/*.kt"
+    target("**/*.kt")
     targetExclude("**/build/**/*.kt", "${rootProject.rootDir}/spotless/**")
     ktlint(ktlintVersion).setEditorConfigPath(
       "${rootProject.rootDir}/.editorconfig"