Remove Spotless, add ktfmt Gradle plugin

facebook · Aug 8, 2024 · 9e65d79 · 9e65d79
1 parent ade7a12
commit 9e65d79
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/ktfmt_idea_plugin/build.gradle.kts b/ktfmt_idea_plugin/build.gradle.kts
@@ -20,7 +20,7 @@ plugins {
     java
     alias(libs.plugins.kotlin)
     alias(libs.plugins.intelliJPlatform)
-    alias(libs.plugins.spotless)
+    alias(libs.plugins.ktfmt)
 }
 
 val ktfmtVersion = rootProject.file("../version.txt").readText().trim()
@@ -46,8 +46,7 @@ dependencies {
         zipSigner()
     }
 
-    implementation("com.facebook", "ktfmt", ktfmtVersion)
-    implementation(libs.googleJavaFormat)
+    implementation("com.facebook:ktfmt:$ktfmtVersion")
 }
 
 intellijPlatform {
@@ -61,8 +60,6 @@ intellijPlatform {
     pluginVerification { ides { recommended() } }
 }
 
-spotless { java { googleJavaFormat(libs.versions.googleJavaFormat.get()) } }
-
 val runIntellij242 by
     intellijPlatformTesting.runIde.registering {
         type = IntellijIdeaCommunity

diff --git a/ktfmt_idea_plugin/gradle/libs.versions.toml b/ktfmt_idea_plugin/gradle/libs.versions.toml
@@ -1,15 +1,11 @@
 [versions]
-googleJavaFormat = "1.23.0"
 kotlin = "2.0.0"
 
 # plugins
 gradlePlugin-intelliJPlatform = "2.0.0"
-gradlePlugin-spotless = "6.25.0"
-
-[libraries]
-googleJavaFormat = { module = "com.google.googlejavaformat:google-java-format", version.ref = "googleJavaFormat" }
+gradlePlugin-ktfmt = "0.19.0"
 
 [plugins]
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "gradlePlugin-intelliJPlatform" }
-spotless = { id = "com.diffplug.spotless", version.ref = "gradlePlugin-spotless" }
+ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "gradlePlugin-ktfmt" }