From 75b9feff46d27b924111e7a39694927677d69723 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 18:42:18 +0000 Subject: [PATCH 1/2] Update maven.ktlint to v1.3.1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 6ad4567..1809fa9 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -6,7 +6,7 @@ google-agp = "8.5.0" google-ksp = "2.0.0-1.0.22" maven-junit = "5.10.3" maven-assertj = "3.26.0" -maven-ktlint = "1.2.1" +maven-ktlint = "1.3.1" maven-commons = "2.16.1" maven-binarycompatibilityvalidator = "0.14.0" From 21d4916c2a134ee130319fd8ba078a1c1f344c42 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Kwiecin=CC=81ski?= Date: Tue, 2 Jul 2024 21:04:17 +0200 Subject: [PATCH 2/2] Adjust codestyle to ktlint 1.3.1 --- .gitignore | 1 + .../functional/KotlinProjectTest.kt | 32 ++++++++++++++----- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 43dfc7a..f30c65b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ TODO.md .gradle/ build/ local.properties +.kotlin diff --git a/ktlint-gradle-plugin/src/test/kotlin/io/github/usefulness/functional/KotlinProjectTest.kt b/ktlint-gradle-plugin/src/test/kotlin/io/github/usefulness/functional/KotlinProjectTest.kt index 0361210..bfaedf9 100644 --- a/ktlint-gradle-plugin/src/test/kotlin/io/github/usefulness/functional/KotlinProjectTest.kt +++ b/ktlint-gradle-plugin/src/test/kotlin/io/github/usefulness/functional/KotlinProjectTest.kt @@ -266,7 +266,9 @@ internal class KotlinProjectTest : WithGradleTest.Kotlin() { kotlinSourceFile( "CustomClass.kt", """ - data class CustomClass(val value: Int) + data class CustomClass( + val value: Int, + ) """.trimIndent(), ) @@ -281,7 +283,9 @@ internal class KotlinProjectTest : WithGradleTest.Kotlin() { kotlinSourceFile( "CustomClass.kt", """ - data class CustomClass(val modified: Int) + data class CustomClass( + val modified: Int, + ) """.trimIndent(), ) @@ -301,7 +305,9 @@ internal class KotlinProjectTest : WithGradleTest.Kotlin() { kotlinSourceFile( "CustomClass.kt", """ - data class CustomClass(val modifiedEditorconfig: Int) + data class CustomClass( + val modifiedEditorconfig: Int, + ) """.trimIndent(), ) @@ -313,7 +319,9 @@ internal class KotlinProjectTest : WithGradleTest.Kotlin() { kotlinSourceFile( "WrongFilename.kt", """ - data class AnotherCustomClass(val modifiedEditorconfig: Int) + data class AnotherCustomClass( + val modifiedEditorconfig: Int, + ) """.trimIndent(), ) @@ -338,7 +346,9 @@ internal class KotlinProjectTest : WithGradleTest.Kotlin() { kotlinSourceFile( "CustomClass.kt", """ - data class CustomClass(val value: Int) + data class CustomClass( + val value: Int, + ) """.trimIndent(), ) @@ -353,7 +363,9 @@ internal class KotlinProjectTest : WithGradleTest.Kotlin() { kotlinSourceFile( "CustomClass.kt", """ - data class CustomClass(val modified: Int) + data class CustomClass( + val modified: Int, + ) """.trimIndent(), ) @@ -373,7 +385,9 @@ internal class KotlinProjectTest : WithGradleTest.Kotlin() { kotlinSourceFile( "CustomClass.kt", """ - data class CustomClass(val modifiedEditorconfig: Int) + data class CustomClass( + val modifiedEditorconfig: Int, + ) """.trimIndent(), ) @@ -385,7 +399,9 @@ internal class KotlinProjectTest : WithGradleTest.Kotlin() { kotlinSourceFile( "WrongFilename.kt", """ - data class AnotherCustomClass(val modifiedEditorconfig: Int) + data class AnotherCustomClass( + val modifiedEditorconfig: Int, + ) """.trimIndent(), )