diff options
| author | Harsh Shandilya <me@msfjarvis.dev> | 2023-07-06 12:38:56 +0530 |
|---|---|---|
| committer | Harsh Shandilya <me@msfjarvis.dev> | 2023-07-06 13:02:17 +0530 |
| commit | f5839396352df60db953c1d33c3c93f0c8348f7e (patch) | |
| tree | 15b9db7cef84b2a73f5366cadbfc1fc3af7a78ef /build-logic | |
| parent | 053eb4e88377e5b66a8d3e12f06ffe893fb4bb6f (diff) | |
fix(build): adjust ktfmt path filtering to allow formatting build.gradle.kts files
Diffstat (limited to 'build-logic')
| -rw-r--r-- | build-logic/build.gradle.kts | 3 | ||||
| -rw-r--r-- | build-logic/settings.gradle.kts | 4 | ||||
| -rw-r--r-- | build-logic/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index 20d2ff4a..06fbd19a 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -5,7 +5,8 @@ plugins { `kotlin-dsl` } -private val jvmToolchainAction = Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) } +private val jvmToolchainAction = + Action<JavaToolchainSpec> { languageVersion.set(JavaLanguageVersion.of(17)) } kotlin.jvmToolchain(jvmToolchainAction) diff --git a/build-logic/settings.gradle.kts b/build-logic/settings.gradle.kts index 9345c8b5..3749cab8 100644 --- a/build-logic/settings.gradle.kts +++ b/build-logic/settings.gradle.kts @@ -6,9 +6,7 @@ rootProject.name = "build-logic" -plugins { - id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" -} +plugins { id("org.gradle.toolchains.foojay-resolver-convention") version "0.5.0" } dependencyResolutionManagement { repositories { diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt index c7ff2f06..90636e4b 100644 --- a/build-logic/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt +++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/KtfmtPlugin.kt @@ -12,7 +12,7 @@ class KtfmtPlugin : Plugin<Project> { override fun apply(target: Project) { val input = Callable { target.layout.projectDirectory.asFileTree.filter { file -> - file.extension == "kt" || file.extension == "kts" && !file.canonicalPath.contains("build") + file.extension == "kt" || file.extension == "kts" && !file.canonicalPath.contains("build/") } } target.tasks.register<KtfmtFormatTask>("ktfmtFormat") { source(input) } |