Switch to simple in-repo format

Author: ZacSweers

build.gradle.kts

@@ -14,11 +14,18 @@
  * limitations under the License.
  */
 
+import org.gradle.api.attributes.Bundling
+import org.gradle.api.attributes.Category
+import org.gradle.api.attributes.LibraryElements
+import org.gradle.api.attributes.Usage
+import org.gradle.api.attributes.java.TargetJvmEnvironment
+import org.gradle.api.file.FileCollection
+import org.gradle.process.CommandLineArgumentProvider
+
 plugins {
   alias(libs.plugins.dokka) apply false
   alias(libs.plugins.intelliJPlatform) apply false
   alias(libs.plugins.kotlin) apply false
-  alias(libs.plugins.ktfmt) apply false
   alias(libs.plugins.nexusPublish)
   alias(libs.plugins.shadowJar) apply false
 }
@@ -27,6 +34,75 @@ version = providers.gradleProperty("ktfmt.version").get()
 
 tasks.wrapper { distributionType = Wrapper.DistributionType.ALL }
 
+repositories {
+  mavenCentral()
+}
+
+val ktfmtCliDependencies = configurations.dependencyScope("ktfmtCliDependencies")
+val ktfmtCliClasspath =
+    configurations.resolvable("ktfmtCliClasspath") {
+      extendsFrom(ktfmtCliDependencies.get())
+      attributes {
+        attribute(Usage.USAGE_ATTRIBUTE, objects.named(Usage.JAVA_RUNTIME))
+        attribute(Category.CATEGORY_ATTRIBUTE, objects.named(Category.LIBRARY))
+        attribute(LibraryElements.LIBRARY_ELEMENTS_ATTRIBUTE, objects.named(LibraryElements.JAR))
+        attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
+        attribute(
+            TargetJvmEnvironment.TARGET_JVM_ENVIRONMENT_ATTRIBUTE,
+            objects.named(TargetJvmEnvironment.STANDARD_JVM),
+        )
+      }
+    }
+
+dependencies { add(ktfmtCliDependencies.name, project(":ktfmt")) }
+
+val ktfmtFiles =
+    fileTree(rootDir) {
+      include("**/*.kt")
+      include("**/*.kts")
+      exclude("**/build/**")
+    }
+
+class KtfmtArgumentsProvider(
+    @get:InputFiles @get:PathSensitive(PathSensitivity.RELATIVE) val files: FileCollection,
+    @get:Input val check: Boolean,
+) : CommandLineArgumentProvider {
+  override fun asArguments(): Iterable<String> = buildList {
+    add("--quiet")
+    if (check) {
+      add("--dry-run")
+      add("--set-exit-if-changed")
+    }
+    addAll(files.files.sorted().map { it.path })
+  }
+}
+
+fun JavaExec.configureKtfmtRun(files: FileCollection, check: Boolean) {
+  group = if (check) "verification" else "formatting"
+  classpath = ktfmtCliClasspath.get()
+  mainClass.set("com.facebook.ktfmt.cli.Main")
+  argumentProviders.add(KtfmtArgumentsProvider(files, check))
+  onlyIf { files.files.isNotEmpty() }
+}
+
+val ktfmtCheck =
+    tasks.register<JavaExec>("ktfmtCheck") {
+      group = "verification"
+      description = "Run Ktfmt formatter validation"
+      configureKtfmtRun(ktfmtFiles, check = true)
+    }
+
+val ktfmtFormat =
+    tasks.register<JavaExec>("ktfmtFormat") {
+      group = "formatting"
+      description = "Run Ktfmt formatter"
+      configureKtfmtRun(ktfmtFiles, check = false)
+    }
+
+subprojects {
+  tasks.named { it == "check" }.configureEach { dependsOn(rootProject.tasks.named("ktfmtCheck")) }
+}
+
 nexusPublishing {
   repositories {
     sonatype {

core/build.gradle.kts

@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 
-import com.ncorti.ktfmt.gradle.TrailingCommaManagementStrategy
 import kotlin.io.path.writeText
 import org.jetbrains.dokka.gradle.DokkaTask
 import org.jetbrains.intellij.platform.gradle.utils.asPath
@@ -24,7 +23,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
   kotlin("jvm")
   id("com.gradleup.shadow")
-  id("com.ncorti.ktfmt.gradle")
   id("maven-publish")
   id("org.jetbrains.dokka")
   id("signing")
@@ -52,9 +50,6 @@ val generateSources by tasks.registering {
   dependsOn(tasks.named("generateKtfmtFile"))
 }
 
-fun Task.isSelfKtfmtTask(): Boolean =
-    name.startsWith("ktfmtCheck") || name.startsWith("ktfmtFormat")
-
 tasks {
   // Create Ktfmt.kt file with version information
   register("generateKtfmtFile") {
@@ -89,12 +84,6 @@ tasks {
 
   // Handle multiple versions of Kotlin here
   withType<KotlinCompile> {
-    // ktfmt-gradle normally makes compilation run after ktfmt tasks. This module's ktfmt tasks use
-    // the in-tree formatter jar, so the formatter checks need the jar first in clean builds.
-    val orderingWithoutSelfKtfmt =
-        mustRunAfter.getDependencies(this).filterNot { it.isSelfKtfmtTask() }
-    setMustRunAfter(orderingWithoutSelfKtfmt)
-
     // Only get major and minor version, e.g. 1.8.0-beta1 -> 1.8
     val kotlinVersion = rootProject.libs.versions.kotlin.get().substringBeforeLast(".")
     exclude {
@@ -106,8 +95,6 @@ tasks {
   // Add main class to jar manifest
   withType(Jar::class) { manifest { attributes["Main-Class"] = "com.facebook.ktfmt.cli.Main" } }
 
-  matching { it.isSelfKtfmtTask() }.configureEach { dependsOn(named("jar")) }
-
   // Sources
   register("sourcesJar", Jar::class) {
     archiveClassifier.set("sources")
@@ -146,8 +133,6 @@ kotlin {
   }
 }
 
-ktfmt { trailingCommaManagementStrategy.set(TrailingCommaManagementStrategy.ONLY_ADD) }
-
 group = "com.facebook"
 
 version = rootProject.version

gradle/libs.versions.toml

@@ -14,7 +14,6 @@ org-ec4j-core = "1.2.0"
 # plugins
 gradlePlugin-dokka = "2.0.0"
 gradlePlugin-intelliJPlatform = "2.6.0"
-gradlePlugin-ktfmt = "0.24.0"
 gradlePlugin-nexusPublish = "2.0.0"
 gradlePlugin-shadowJar = "9.0.2"
 
@@ -39,6 +38,5 @@ kotlin-test-junit4 = { module = "org.jetbrains.kotlin:kotlin-test-junit", versio
 dokka = { id = "org.jetbrains.dokka", version.ref = "gradlePlugin-dokka" }
 intelliJPlatform = { id = "org.jetbrains.intellij.platform", version.ref = "gradlePlugin-intelliJPlatform" }
 kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
-ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "gradlePlugin-ktfmt" }
 nexusPublish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "gradlePlugin-nexusPublish" }
 shadowJar = { id = "com.gradleup.shadow", version.ref = "gradlePlugin-shadowJar" }

ktfmt_idea_plugin/build.gradle.kts

@@ -19,7 +19,6 @@ import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType.IntellijIdeaC
 plugins {
   java
   alias(libs.plugins.kotlin)
-  alias(libs.plugins.ktfmt)
   alias(libs.plugins.intelliJPlatform)
 }
 
@@ -51,12 +50,6 @@ dependencies {
   implementation(project(":ktfmt"))
 }
 
-ktfmt {
-  trailingCommaManagementStrategy.set(
-      com.ncorti.ktfmt.gradle.TrailingCommaManagementStrategy.ONLY_ADD
-  )
-}
-
 intellijPlatform {
   projectName.set("ktfmt_idea_plugin")
 

online_formatter/build.gradle.kts

@@ -16,7 +16,6 @@
 
 plugins {
   kotlin("jvm")
-  id("com.ncorti.ktfmt.gradle")
 }
 
 repositories {
@@ -39,12 +38,6 @@ kotlin {
   jvmToolchain(javaVersion.toInt())
 }
 
-ktfmt {
-  trailingCommaManagementStrategy.set(
-      com.ncorti.ktfmt.gradle.TrailingCommaManagementStrategy.ONLY_ADD
-  )
-}
-
 tasks {
   test { useJUnit() }