Gradle: Update Spotless plugin to 6.25.0

See https://github.com/pinterest/ktlint/releases/tag/1.2.1 and https://github.com/pinterest/ktlint/releases/tag/1.2.1
saschpe · Mar 23, 2024 · 2bf535b · 2bf535b
1 parent 963b703
commit 2bf535b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -8,5 +8,8 @@ end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
 
+# noinspection EditorConfigKeyCorrectness
 [*.{kt,kts}]
-ktlint_standard_no-wildcard-imports = disabled
+ktlint_code_style = intellij_idea
+ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = unset
+ktlint_standard_no-wildcard-imports = disabled
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    id("com.diffplug.spotless") version "6.21.0"
+    id("com.diffplug.spotless") version "6.25.0"
     id("com.github.ben-manes.versions") version "0.48.0"
 }
 
@@ -10,10 +10,10 @@ spotless {
     }
     kotlin {
         target("**/*.kt")
-        ktlint().setEditorConfigPath(".editorconfig")
+        ktlint("1.2.1").setEditorConfigPath(".editorconfig")
     }
     kotlinGradle {
-        ktlint().setEditorConfigPath(".editorconfig")
+        ktlint("1.2.1").setEditorConfigPath(".editorconfig")
     }
 }
 

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -18,8 +18,8 @@ tasks {
                     """
 object Secrets {
     object Sonatype {
-        const val user = ""
-        const val apiKey = ""
+        const val USER = ""
+        const val API_KEY = ""
     }
 }
 
@@ -32,4 +32,4 @@ object Secrets {
     compileKotlin {
         dependsOn(ensureSecretsExist)
     }
-}
+}
diff --git a/log4k-slf4j/build.gradle.kts b/log4k-slf4j/build.gradle.kts
@@ -76,8 +76,8 @@ publishing {
         maven {
             name = "sonatype"
             credentials {
-                username = Secrets.Sonatype.user
-                password = Secrets.Sonatype.apiKey
+                username = Secrets.Sonatype.USER
+                password = Secrets.Sonatype.API_KEY
             }
             url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
         }

diff --git a/log4k/build.gradle.kts b/log4k/build.gradle.kts
@@ -73,8 +73,8 @@ publishing {
         maven {
             name = "sonatype"
             credentials {
-                username = Secrets.Sonatype.user
-                password = Secrets.Sonatype.apiKey
+                username = Secrets.Sonatype.USER
+                password = Secrets.Sonatype.API_KEY
             }
             url = uri("https://oss.sonatype.org/service/local/staging/deploy/maven2")
         }