This repository was archived by the owner on Oct 15, 2024. It is now read-only.
File tree Expand file tree Collapse file tree 4 files changed +18
-25
lines changed
build-logic/src/main/kotlin/app/passwordstore/gradle Expand file tree Collapse file tree 4 files changed +18
-25
lines changed Original file line number Diff line number Diff line change @@ -2,6 +2,7 @@ package app.passwordstore.gradle
22
33import app.passwordstore.gradle.ktfmt.KtfmtCheckTask
44import app.passwordstore.gradle.ktfmt.KtfmtFormatTask
5+ import com.facebook.ktfmt.format.FormattingOptions
56import java.util.concurrent.Callable
67import org.gradle.api.Plugin
78import 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}
Original file line number Diff line number Diff line change 11package app.passwordstore.gradle.ktfmt
22
3+ import app.passwordstore.gradle.KtfmtPlugin
34import com.facebook.ktfmt.format.Formatter
4- import com.facebook.ktfmt.format.FormattingOptions
55import java.io.File
66import kotlinx.coroutines.Dispatchers
77import 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)
Original file line number Diff line number Diff line change 11package app.passwordstore.gradle.ktfmt
22
3+ import app.passwordstore.gradle.KtfmtPlugin
34import com.facebook.ktfmt.format.Formatter
4- import com.facebook.ktfmt.format.FormattingOptions
55import java.io.File
66import org.gradle.api.logging.LogLevel
77import 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" )
Original file line number Diff line number Diff line change @@ -39,7 +39,7 @@ build-diffutils = "io.github.java-diff-utils:java-diff-utils:4.12"
3939build-download = " de.undercouch:gradle-download-task:5.6.0"
4040build-javapoet = " com.squareup:javapoet:1.13.0"
4141build-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 "
4343build-mavenpublish = " com.vanniktech:gradle-maven-publish-plugin:0.28.0"
4444build-metalava = " me.tylerbwong.gradle.metalava:plugin:0.3.5"
4545build-moshi = { module = " com.squareup.moshi:moshi" , version.ref = " moshi" }
You can’t perform that action at this time.
0 commit comments