Skip to content

Commit a6ae0e5

Browse files
cortinicofacebook-github-bot
authored andcommitted
Remove the ktfmt Gradle plugin (#58467)
Summary: Remove the ktfmt Gradle plugin and its task wiring now that Kotlin formatting is provided by the repository npm command. Changelog: [Internal] Reviewed By: javache Differential Revision: D119504761
1 parent 9287005 commit a6ae0e5

9 files changed

Lines changed: 0 additions & 72 deletions

File tree

build.gradle.kts

Lines changed: 0 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ plugins {
1313
alias(libs.plugins.kotlin.android) apply false
1414
alias(libs.plugins.binary.compatibility.validator) apply true
1515
alias(libs.plugins.android.test) apply false
16-
alias(libs.plugins.ktfmt) apply true
1716
}
1817

1918
val reactAndroidProperties = java.util.Properties()
@@ -176,42 +175,3 @@ if (hermesSubstitution != null) {
176175
}
177176
}
178177
}
179-
180-
ktfmt {
181-
blockIndent.set(2)
182-
continuationIndent.set(4)
183-
maxWidth.set(100)
184-
removeUnusedImports.set(false)
185-
manageTrailingCommas.set(false)
186-
}
187-
188-
// Configure ktfmt tasks to include gradle-plugin
189-
listOf("ktfmtCheck", "ktfmtFormat").forEach { taskName ->
190-
tasks.named(taskName) { dependsOn(gradle.includedBuild("gradle-plugin").task(":$taskName")) }
191-
}
192-
193-
allprojects {
194-
// Apply exclusions for specific files that should not be formatted
195-
val excludePatterns = listOf(
196-
"**/build/**",
197-
"**/hermes-engine/**",
198-
"**/internal/featureflags/**",
199-
"**/systeminfo/ReactNativeVersion.kt",
200-
)
201-
listOf(
202-
com.ncorti.ktfmt.gradle.tasks.KtfmtCheckTask::class,
203-
com.ncorti.ktfmt.gradle.tasks.KtfmtFormatTask::class,
204-
)
205-
.forEach { tasks.withType(it) { exclude(excludePatterns) } }
206-
207-
// Disable the problematic ktfmt script tasks due to symbolic link issues in subprojects
208-
afterEvaluate {
209-
listOf("ktfmtCheckScripts", "ktfmtFormatScripts").forEach {
210-
tasks.findByName(it)?.enabled = false
211-
}
212-
}
213-
}
214-
215-
// We intentionally disable the `ktfmtCheck` tasks as the formatting is primarly handled inside
216-
// fbsource
217-
allprojects { tasks.withType<com.ncorti.ktfmt.gradle.tasks.KtfmtCheckTask>() { enabled = false } }

packages/gradle-plugin/build.gradle.kts

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
plugins {
99
alias(libs.plugins.kotlin.jvm).apply(false)
10-
alias(libs.plugins.ktfmt).apply(true)
1110
}
1211

1312
tasks.register("build") {
@@ -27,25 +26,3 @@ tasks.register("clean") {
2726
":shared:clean",
2827
)
2928
}
30-
31-
tasks.named("ktfmtCheck") {
32-
dependsOn(
33-
":react-native-gradle-plugin:ktfmtCheck",
34-
":settings-plugin:ktfmtCheck",
35-
":shared-testutil:ktfmtCheck",
36-
":shared:ktfmtCheck",
37-
)
38-
}
39-
40-
tasks.named("ktfmtFormat") {
41-
dependsOn(
42-
":react-native-gradle-plugin:ktfmtFormat",
43-
":settings-plugin:ktfmtFormat",
44-
":shared-testutil:ktfmtFormat",
45-
":shared:ktfmtFormat",
46-
)
47-
}
48-
49-
// We intentionally disable the `ktfmtCheck` tasks as the formatting is primarly handled inside
50-
// fbsource
51-
allprojects { tasks.withType<com.ncorti.ktfmt.gradle.tasks.KtfmtCheckTask>() { enabled = false } }

packages/gradle-plugin/gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ javapoet = "1.13.0"
66
junit = "4.13.2"
77
kotlin = "2.2.0"
88
assertj = "3.25.1"
9-
ktfmt = "0.22.0"
109

1110
[libraries]
1211
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -19,4 +18,3 @@ assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
1918

2019
[plugins]
2120
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
22-
ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt" }

packages/gradle-plugin/react-native-gradle-plugin/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1212

1313
plugins {
1414
alias(libs.plugins.kotlin.jvm)
15-
alias(libs.plugins.ktfmt)
1615
id("java-gradle-plugin")
1716
}
1817

packages/gradle-plugin/settings-plugin/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1212

1313
plugins {
1414
alias(libs.plugins.kotlin.jvm)
15-
alias(libs.plugins.ktfmt)
1615
id("java-gradle-plugin")
1716
}
1817

packages/gradle-plugin/shared-testutil/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1212

1313
plugins {
1414
alias(libs.plugins.kotlin.jvm)
15-
alias(libs.plugins.ktfmt)
1615
}
1716

1817
repositories { mavenCentral() }

packages/gradle-plugin/shared/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
1212

1313
plugins {
1414
alias(libs.plugins.kotlin.jvm)
15-
alias(libs.plugins.ktfmt)
1615
}
1716

1817
repositories { mavenCentral() }

packages/react-native/ReactAndroid/build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ plugins {
1818
id("com.facebook.react")
1919
alias(libs.plugins.android.library)
2020
alias(libs.plugins.download)
21-
alias(libs.plugins.ktfmt)
2221
}
2322

2423
version = project.findProperty("VERSION_NAME")?.toString()!!

packages/react-native/gradle/libs.versions.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ jsc-android = "2026004.0.1"
3131
jsr305 = "3.0.2"
3232
junit = "4.13.2"
3333
kotlin = "2.2.0"
34-
ktfmt = "0.22.0"
3534
mockito = "3.12.4"
3635
mockito-kotlin = "3.2.0"
3736
nexus-publish = "2.0.0"
@@ -97,7 +96,6 @@ thoughtworks = {module = "com.thoughtworks.xstream:xstream", version.ref = "xstr
9796
android-application = { id = "com.android.application", version.ref = "agp" }
9897
android-library = { id = "com.android.library", version.ref = "agp" }
9998
download = { id = "de.undercouch.download", version.ref = "download" }
100-
ktfmt = { id = "com.ncorti.ktfmt.gradle", version.ref = "ktfmt" }
10199
nexus-publish = { id = "io.github.gradle-nexus.publish-plugin", version.ref = "nexus-publish" }
102100
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
103101
binary-compatibility-validator = { id = "org.jetbrains.kotlinx.binary-compatibility-validator", version.ref = "binary-compatibility-validator" }

0 commit comments

Comments
 (0)