diff options
| -rw-r--r-- | app/build.gradle.kts | 4 | ||||
| -rw-r--r-- | autofill-parser/build.gradle.kts | 4 | ||||
| -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 |
5 files changed, 6 insertions, 11 deletions
diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 5ba7b7a0..3fc03022 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -29,9 +29,7 @@ android { testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } - buildFeatures { - compose = true - } + buildFeatures { compose = true } composeOptions { useLiveLiterals = false kotlinCompilerExtensionVersion = libs.versions.composeCompiler.get() diff --git a/autofill-parser/build.gradle.kts b/autofill-parser/build.gradle.kts index 137aa2a1..6e6e8dcf 100644 --- a/autofill-parser/build.gradle.kts +++ b/autofill-parser/build.gradle.kts @@ -23,9 +23,7 @@ android { } tasks.withType<KotlinCompile>().configureEach { - compilerOptions { - languageVersion.set(KotlinVersion.KOTLIN_1_7) - } + compilerOptions { languageVersion.set(KotlinVersion.KOTLIN_1_7) } } dependencies { 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) } |