From 87b554fae199af896cba36e4e2171ea4fa37ac89 Mon Sep 17 00:00:00 2001 From: Niklas Baudy Date: Fri, 16 Sep 2022 22:01:57 +0200 Subject: [PATCH] Update ktlint to 0.47.1 --- .editorconfig | 6 +++++- build.gradle | 2 +- .../quality/tools/CodeQualityToolsPluginExtension.kt | 2 +- .../vanniktech/code/quality/tools/DetektCheckTask.kt | 6 +++--- .../com/vanniktech/code/quality/tools/KtLintTask.kt | 2 +- .../quality/tools/CodeQualityToolsPluginDetektTest.kt | 8 ++++---- .../quality/tools/CodeQualityToolsPluginKotlinTest.kt | 6 +++--- .../quality/tools/CodeQualityToolsPluginKtlintTest.kt | 10 +++++----- .../code/quality/tools/CommonCodeQualityToolsTest.kt | 9 +++++---- .../kotlin/com/vanniktech/code/quality/tools/utils.kt | 3 ++- 10 files changed, 30 insertions(+), 24 deletions(-) diff --git a/.editorconfig b/.editorconfig index d035620..1d967e8 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,3 +1,7 @@ [*.{kt,kts}] indent_size=2 -continuation_indent_size=2 \ No newline at end of file +continuation_indent_size=2 +insert_final_newline=true +ij_kotlin_allow_trailing_comma=true +ij_kotlin_allow_trailing_comma_on_call_site=true +ktlint_disabled_rules=annotation,argument-list-wrapping,spacing-between-declarations-with-annotations,filename diff --git a/build.gradle b/build.gradle index 4ae5b07..4f30bfa 100755 --- a/build.gradle +++ b/build.gradle @@ -30,7 +30,7 @@ validatePlugins { codeQualityTools { ktlint { - toolVersion = '0.45.2' + toolVersion = '0.47.1' } detekt { toolVersion = '1.0.0' diff --git a/src/main/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginExtension.kt b/src/main/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginExtension.kt index f269aa6..69f218a 100644 --- a/src/main/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginExtension.kt +++ b/src/main/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginExtension.kt @@ -5,7 +5,7 @@ import org.gradle.api.model.ObjectFactory import javax.inject.Inject open class CodeQualityToolsPluginExtension @Inject constructor( - objectFactory: ObjectFactory + objectFactory: ObjectFactory, ) { /** * When set to true all enabled code quality tools will be configured in a way that even a single warning / error will fail the build process. diff --git a/src/main/kotlin/com/vanniktech/code/quality/tools/DetektCheckTask.kt b/src/main/kotlin/com/vanniktech/code/quality/tools/DetektCheckTask.kt index 55cec39..6da684d 100644 --- a/src/main/kotlin/com/vanniktech/code/quality/tools/DetektCheckTask.kt +++ b/src/main/kotlin/com/vanniktech/code/quality/tools/DetektCheckTask.kt @@ -61,7 +61,7 @@ import javax.inject.Inject internal data class ReportingMetaInformation( val reportId: String, val fileEnding: String, - val fileNameSuffix: String + val fileNameSuffix: String, ) internal interface DetektParameters : WorkParameters { @@ -94,7 +94,7 @@ internal abstract class DetektWorker @Inject internal constructor( val reportValue = listOf( ReportingMetaInformation("plain", "txt", "plain"), ReportingMetaInformation("xml", "xml", "checkstyle"), - ReportingMetaInformation("html", "html", "report") + ReportingMetaInformation("html", "html", "report"), ).joinToString(separator = ",") { it.fileEnding + ":" + File(parameters.outputDirectory.asFile.get(), "detekt-${it.fileNameSuffix}.${it.fileEnding}").absolutePath } @@ -104,7 +104,7 @@ internal abstract class DetektWorker @Inject internal constructor( task.classpath = parameters.classpath task.args( "--input", parameters.inputFile.get().asFile, - reportKey, reportValue + reportKey, reportValue, ) val configFile = parameters.configFile.asFile.get() diff --git a/src/main/kotlin/com/vanniktech/code/quality/tools/KtLintTask.kt b/src/main/kotlin/com/vanniktech/code/quality/tools/KtLintTask.kt index 4da8ebb..f38a1b9 100644 --- a/src/main/kotlin/com/vanniktech/code/quality/tools/KtLintTask.kt +++ b/src/main/kotlin/com/vanniktech/code/quality/tools/KtLintTask.kt @@ -64,7 +64,7 @@ internal abstract class KtLintWorker @Inject internal constructor( "**/*.kt", "**/*.kts", "!build/", - "!build/**" + "!build/**", ) } } diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt index aa3f7c2..8b2ef51 100755 --- a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt +++ b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginDetektTest.kt @@ -103,7 +103,7 @@ class CodeQualityToolsPluginDetektTest { InvalidPackageDeclaration:Foo.kt$.Foo.kt - """.trimIndent() + """.trimIndent(), ) .withKotlinFile(testPath, "fun foo(i: Int) = i * 3\n") .succeeds() @@ -131,7 +131,7 @@ class CodeQualityToolsPluginDetektTest { private val baselineFileName: String? = null, buildUponDefaultConfig: Boolean = false, parallel: Boolean = false, - inputDirectoryName: String = "." + inputDirectoryName: String = ".", ) { init { directory.newFile("build.gradle").writeText( @@ -161,7 +161,7 @@ class CodeQualityToolsPluginDetektTest { | jcenter() |} | - """.trimMargin() + """.trimMargin(), ) } @@ -186,7 +186,7 @@ class CodeQualityToolsPluginDetektTest { taskToRun: String = "detektCheck", taskToCheck: String = taskToRun, assertReportsExist: Boolean = true, - containsMessage: String + containsMessage: String, ) = apply { val buildResult = run(taskToRun).buildAndFail() assertEquals(TaskOutcome.FAILED, buildResult.task(":$taskToCheck")?.outcome) diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKotlinTest.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKotlinTest.kt index 2179261..161948d 100755 --- a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKotlinTest.kt +++ b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKotlinTest.kt @@ -23,13 +23,13 @@ class CodeQualityToolsPluginKotlinTest { """ @Deprecated("Don't use this") fun bar() = { } fun foo() = bar() - """.trimIndent() + """.trimIndent(), ) .fails(containsMessage = "bar(): () -> Unit' is deprecated. Don't use this") } class Roboter( - private val directory: TemporaryFolder + private val directory: TemporaryFolder, ) { init { directory.newFile("build.gradle").writeText( @@ -55,7 +55,7 @@ class CodeQualityToolsPluginKotlinTest { | implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.41' |} | - """.trimMargin() + """.trimMargin(), ) } diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKtlintTest.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKtlintTest.kt index f8c8ba0..972b27d 100755 --- a/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKtlintTest.kt +++ b/src/test/kotlin/com/vanniktech/code/quality/tools/CodeQualityToolsPluginKtlintTest.kt @@ -29,7 +29,7 @@ class CodeQualityToolsPluginKtlintTest { """ |[*.{kt,kts}] |insert_final_newline=true - """.trimMargin() + """.trimMargin(), ) .withKotlinFile("src/main/kotlin/com/vanniktech/test/Foo.kt", "fun foo(param: Int) = param * param") .fails(containsMessage = "/src/main/kotlin/com/vanniktech/test/Foo.kt:1:1: File must end with a newline (\\n)") @@ -41,7 +41,7 @@ class CodeQualityToolsPluginKtlintTest { """ |[*.{kt,kts}] |insert_final_newline=true - """.trimMargin() + """.trimMargin(), ) .withKotlinFile("src/main/kotlin/com/vanniktech/test/Foo.kt", "fun foo(param: Int) = param * param") .succeeds(taskToRun = "ktlintFormat") @@ -54,7 +54,7 @@ class CodeQualityToolsPluginKtlintTest { """ |[*.{kt,kts}] |insert_final_newline=true - """.trimMargin() + """.trimMargin(), ) .withKotlinFile("src/main/kotlin/com/vanniktech/test/Foo.kt", "fun foo(param: Int) = param * param") .succeeds(taskToRun = "ktlintFormat") @@ -119,7 +119,7 @@ class CodeQualityToolsPluginKtlintTest { private val directory: TemporaryFolder, enabled: Boolean = true, version: String = "0.44.0", - experimental: Boolean = false + experimental: Boolean = false, ) { init { directory.newFile("build.gradle").writeText( @@ -149,7 +149,7 @@ class CodeQualityToolsPluginKtlintTest { | implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.3.41' |} | - """.trimMargin() + """.trimMargin(), ) } diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/CommonCodeQualityToolsTest.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/CommonCodeQualityToolsTest.kt index af67c01..2e511ef 100755 --- a/src/test/kotlin/com/vanniktech/code/quality/tools/CommonCodeQualityToolsTest.kt +++ b/src/test/kotlin/com/vanniktech/code/quality/tools/CommonCodeQualityToolsTest.kt @@ -26,6 +26,7 @@ abstract class CommonCodeQualityToolsTest { // Project javaGradlePluginProject We can't use this one yet since testing takes forever then. lateinit var kotlinProjects: Array + // Project kotlinProject groovy.lang.MissingPropertyException: No such property: KotlinPlugin for class // Project kotlinAndroidProject groovy.lang.MissingPropertyException: No such property: KotlinPlugin for class lateinit var kotlinPlatformCommonProject: Project @@ -70,24 +71,24 @@ abstract class CommonCodeQualityToolsTest { androidTestProject.plugins.apply(TestPlugin::class.java) emptyProjects = arrayOf( - emptyProject + emptyProject, ) javaProjects = arrayOf( javaProject, - javaLibraryProject + javaLibraryProject, ) kotlinProjects = arrayOf( kotlinPlatformCommonProject, kotlinPlatformJvmProject, - kotlinPlatformJsProject + kotlinPlatformJsProject, ) androidProjects = arrayOf( androidAppProject, androidLibraryProject, - androidTestProject + androidTestProject, ) projects = emptyProjects + javaProjects + kotlinProjects + androidProjects diff --git a/src/test/kotlin/com/vanniktech/code/quality/tools/utils.kt b/src/test/kotlin/com/vanniktech/code/quality/tools/utils.kt index f386bd4..4be5776 100644 --- a/src/test/kotlin/com/vanniktech/code/quality/tools/utils.kt +++ b/src/test/kotlin/com/vanniktech/code/quality/tools/utils.kt @@ -18,7 +18,8 @@ fun defaultExtensions(): CodeQualityToolsPluginExtension { override fun newInstance(type: Class, vararg parameters: Any?): T { return type.newInstance() } - }) + }, + ), ) }