From 72e4a27648960005390d2092bea38a30d3ee2fb3 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Sat, 4 May 2024 07:31:37 +0300 Subject: [PATCH 1/8] Updated spotless --- build.gradle.kts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index bfe377e39..82faba462 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,7 +2,7 @@ plugins { kotlin("jvm") version "2.0.0-RC1" jacoco id("org.sonarqube") version "5.0.0.4638" - id("com.diffplug.spotless") version "6.12.0" + id("com.diffplug.spotless") version "6.25.0" `maven-publish` } @@ -52,7 +52,7 @@ spotless { kotlin { encoding("UTF-8") target("**/src/**/*.kt") - ktlint("0.43.0").userData(mapOf( + ktlint("1.2.1").userData(mapOf( "max_line_length" to "120" )) toggleOffOn() From 8aecb2e1d532c35f4873deb20f50c5c74f6a9d39 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Sat, 4 May 2024 07:38:51 +0300 Subject: [PATCH 2/8] Update build.gradle.kts --- build.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 82faba462..cf8d66f38 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,9 +52,7 @@ spotless { kotlin { encoding("UTF-8") target("**/src/**/*.kt") - ktlint("1.2.1").userData(mapOf( - "max_line_length" to "120" - )) + ktlint("1.2.1") toggleOffOn() trimTrailingWhitespace() endWithNewline() From 9701ed86659449c08f3d6e8da33912388b660565 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Sat, 4 May 2024 07:43:26 +0300 Subject: [PATCH 3/8] Create .editorconfig --- .editorconfig | 1 + 1 file changed, 1 insertion(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 000000000..8c2892abc --- /dev/null +++ b/.editorconfig @@ -0,0 +1 @@ +ktlint_standard_filename = disabled From c59a081682d544292ba1e943f4d9bc6ab367a8e0 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Sat, 4 May 2024 07:46:34 +0300 Subject: [PATCH 4/8] Update .editorconfig --- .editorconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index 8c2892abc..19bf7c44b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1 +1 @@ -ktlint_standard_filename = disabled +ktlint_standard_package-name = disabled From 9ed3f32a9bc6229025e0c693461af24f6f4dd7ef Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Sat, 4 May 2024 07:48:10 +0300 Subject: [PATCH 5/8] Update build.gradle.kts --- build.gradle.kts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index cf8d66f38..6aaa422c0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,9 @@ spotless { kotlin { encoding("UTF-8") target("**/src/**/*.kt") - ktlint("1.2.1") + ktlint("0.43.2").userData(mapOf( + "max_line_length" to "120" + )) toggleOffOn() trimTrailingWhitespace() endWithNewline() From f8792377c3107ab4e3bba4c258d02857786490dd Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Sat, 4 May 2024 08:18:44 +0300 Subject: [PATCH 6/8] Delete .editorconfig --- .editorconfig | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index 19bf7c44b..000000000 --- a/.editorconfig +++ /dev/null @@ -1 +0,0 @@ -ktlint_standard_package-name = disabled From 2f2a29bd2c0d53e4f007c71d4ece745e58eb2a27 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Sat, 4 May 2024 08:19:07 +0300 Subject: [PATCH 7/8] Update build.gradle.kts --- build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.kts b/build.gradle.kts index 6aaa422c0..fa4aa5de0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,7 +52,7 @@ spotless { kotlin { encoding("UTF-8") target("**/src/**/*.kt") - ktlint("0.43.2").userData(mapOf( + ktlint("0.43.0").userData(mapOf( "max_line_length" to "120" )) toggleOffOn() From e462759964ca504143ba130dd77cc920c9b975a4 Mon Sep 17 00:00:00 2001 From: Valentyn Kolesnikov Date: Sat, 4 May 2024 08:22:38 +0300 Subject: [PATCH 8/8] Update build.gradle.kts --- build.gradle.kts | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index fa4aa5de0..fcdb42d31 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -52,9 +52,7 @@ spotless { kotlin { encoding("UTF-8") target("**/src/**/*.kt") - ktlint("0.43.0").userData(mapOf( - "max_line_length" to "120" - )) + ktlint("0.43.2") toggleOffOn() trimTrailingWhitespace() endWithNewline()