Skip to content
This repository was archived by the owner on Oct 15, 2024. It is now read-only.

Commit b596930

Browse files
committed
fix(deps): update ktfmt to 0.51
1 parent 4c0b6d1 commit b596930

File tree

4 files changed

+18
-25
lines changed

4 files changed

+18
-25
lines changed

build-logic/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package app.passwordstore.gradle
22

33
import app.passwordstore.gradle.ktfmt.KtfmtCheckTask
44
import app.passwordstore.gradle.ktfmt.KtfmtFormatTask
5+
import com.facebook.ktfmt.format.FormattingOptions
56
import java.util.concurrent.Callable
67
import org.gradle.api.Plugin
78
import org.gradle.api.Project
@@ -21,4 +22,16 @@ class KtfmtPlugin : Plugin<Project> {
2122
projectDirectory.set(target.layout.projectDirectory)
2223
}
2324
}
25+
26+
companion object {
27+
val DEFAULT_FORMATTING_OPTIONS =
28+
FormattingOptions(
29+
maxWidth = FormattingOptions.DEFAULT_MAX_WIDTH,
30+
blockIndent = 2,
31+
continuationIndent = 2,
32+
removeUnusedImports = true,
33+
debuggingPrintOpsAfterFormatting = false,
34+
manageTrailingCommas = true,
35+
)
36+
}
2437
}

build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package app.passwordstore.gradle.ktfmt
22

3+
import app.passwordstore.gradle.KtfmtPlugin
34
import com.facebook.ktfmt.format.Formatter
4-
import com.facebook.ktfmt.format.FormattingOptions
55
import java.io.File
66
import kotlinx.coroutines.Dispatchers
77
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -50,15 +50,7 @@ abstract class KtfmtCheckTask : SourceTask() {
5050

5151
private fun checkFile(input: File): Pair<Boolean, List<KtfmtDiffEntry>> {
5252
val originCode = input.readText()
53-
val formattedCode =
54-
Formatter.format(
55-
FormattingOptions(
56-
style = FormattingOptions.Style.GOOGLE,
57-
maxWidth = 100,
58-
continuationIndent = 2,
59-
),
60-
originCode,
61-
)
53+
val formattedCode = Formatter.format(KtfmtPlugin.DEFAULT_FORMATTING_OPTIONS, originCode)
6254
val pathNormalizer = { file: File -> file.toRelativeString(projectDirectory.asFile.get()) }
6355
return (originCode != formattedCode) to
6456
KtfmtDiffer.computeDiff(input, formattedCode, pathNormalizer)

build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtWorkerAction.kt

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package app.passwordstore.gradle.ktfmt
22

3+
import app.passwordstore.gradle.KtfmtPlugin
34
import com.facebook.ktfmt.format.Formatter
4-
import com.facebook.ktfmt.format.FormattingOptions
55
import java.io.File
66
import org.gradle.api.logging.LogLevel
77
import org.gradle.api.logging.Logger
@@ -24,19 +24,7 @@ abstract class KtfmtWorkerAction : WorkAction<KtfmtWorkerParameters> {
2424

2525
logger.log(LogLevel.DEBUG, "$name checking format: $relativePath")
2626

27-
val formattedText =
28-
Formatter.format(
29-
FormattingOptions(
30-
style = FormattingOptions.Style.GOOGLE,
31-
maxWidth = FormattingOptions.DEFAULT_MAX_WIDTH,
32-
blockIndent = 2,
33-
continuationIndent = 2,
34-
removeUnusedImports = true,
35-
debuggingPrintOpsAfterFormatting = false,
36-
manageTrailingCommas = true,
37-
),
38-
sourceText,
39-
)
27+
val formattedText = Formatter.format(KtfmtPlugin.DEFAULT_FORMATTING_OPTIONS, sourceText)
4028

4129
if (!formattedText.contentEquals(sourceText)) {
4230
logger.log(LogLevel.QUIET, "${file.toRelativeString(projectDirectory)}: Format fixed")

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ build-diffutils = "io.github.java-diff-utils:java-diff-utils:4.12"
3939
build-download = "de.undercouch:gradle-download-task:5.6.0"
4040
build-javapoet = "com.squareup:javapoet:1.13.0"
4141
build-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
42-
build-ktfmt = "com.facebook:ktfmt:0.50"
42+
build-ktfmt = "com.facebook:ktfmt:0.51"
4343
build-mavenpublish = "com.vanniktech:gradle-maven-publish-plugin:0.28.0"
4444
build-metalava = "me.tylerbwong.gradle.metalava:plugin:0.3.5"
4545
build-moshi = { module = "com.squareup.moshi:moshi", version.ref = "moshi" }

0 commit comments

Comments
 (0)