diff options
Diffstat (limited to 'build-logic')
7 files changed, 8 insertions, 16 deletions
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt index 68195033..de481981 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KotlinCommonPlugin.kt @@ -41,10 +41,7 @@ class KotlinCommonPlugin : Plugin<Project> { companion object { private val ADDITIONAL_COMPILER_ARGS = - listOf( - "-opt-in=kotlin.RequiresOptIn", - "-Xsuppress-version-warnings", - ) + listOf("-opt-in=kotlin.RequiresOptIn", "-Xsuppress-version-warnings") val JVM_TOOLCHAIN_ACTION = Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) } diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt index 83705a74..989b495f 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/crowdin/CrowdinPlugin.kt @@ -62,10 +62,7 @@ class CrowdinDownloadPlugin : Plugin<Project> { if (extension.skipCleanup.getOrElse(false)) { emptySet() } else { - setOf( - extractStrings.map { it.source }, - downloadCrowdin.map { it.outputFiles }, - ) + setOf(extractStrings.map { it.source }, downloadCrowdin.map { it.outputFiles }) } } } diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt index 72dd4111..c29dbd2f 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtCheckTask.kt @@ -57,7 +57,7 @@ abstract class KtfmtCheckTask : SourceTask() { maxWidth = 100, continuationIndent = 2, ), - originCode + originCode, ) val pathNormalizer = { file: File -> file.toRelativeString(projectDirectory.asFile.get()) } return (originCode != formattedCode) to diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt index 6eb76eab..f1332923 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtDiffer.kt @@ -10,7 +10,7 @@ object KtfmtDiffer { fun computeDiff( inputFile: File, formattedCode: String, - pathNormalizer: (File) -> String + pathNormalizer: (File) -> String, ): List<KtfmtDiffEntry> { val originCode = inputFile.readText() return DiffUtils.diff(originCode, formattedCode, null).deltas.map { diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt index 505e7462..c76b5c89 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/ktfmt/KtfmtFormatTask.kt @@ -11,10 +11,8 @@ import org.jetbrains.kotlin.utils.addToStdlib.ifNotEmpty abstract class KtfmtFormatTask @Inject -constructor( - private val workerExecutor: WorkerExecutor, - private val projectLayout: ProjectLayout, -) : SourceTask() { +constructor(private val workerExecutor: WorkerExecutor, private val projectLayout: ProjectLayout) : + SourceTask() { @TaskAction fun execute() { diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt index 914ea188..a23baabb 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/psl/PSLUpdateTask.kt @@ -104,7 +104,7 @@ abstract class PSLUpdateTask : DefaultTask() { var totalRuleBytes: Int = 0, var totalExceptionRuleBytes: Int = 0, val sortedRules: TreeSet<ByteString> = TreeSet(), - val sortedExceptionRules: TreeSet<ByteString> = TreeSet() + val sortedExceptionRules: TreeSet<ByteString> = TreeSet(), ) private companion object { diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt index 3ffb4c71..53601a92 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/tasks/GitHooks.kt @@ -48,7 +48,7 @@ abstract class GitHooks : DefaultTask() { GROUP_EXECUTE, OTHERS_READ, OTHERS_EXECUTE, - ) + ), ) } } |