Update ktlint

massivemadness · massivemadness · commit bec2910ad9a1 · 2023-11-20T18:27:06.000+02:00
diff --git a/.editorconfig b/.editorconfig
@@ -4,7 +4,17 @@ root = true
 indent_size = 4
 insert_final_newline = false
 
-# noinspection EditorConfigKeyCorrectness
+# Ktlint 0.50.0
 ktlint_standard_no-wildcard-imports = disabled
-# noinspection EditorConfigKeyCorrectness
-ktlint_standard_trailing-comma-on-declaration-site = disabled
+ktlint_standard_trailing-comma-on-declaration-site = disabled
+
+# Ktlint 1.0.0
+ktlint_standard_annotation = disabled
+ktlint_standard_statement-wrapping = disabled
+ktlint_standard_blank-line-before-declaration = disabled
+ktlint_standard_no-empty-first-line-in-class-body = disabled
+ktlint_standard_multiline-expression-wrapping = disabled
+ktlint_standard_string-template-indent = disabled
+ktlint_standard_parameter-list-wrapping = disabled
+ktlint_standard_function-signature = disabled
+ktlint_standard_function-naming = disabled
diff --git a/app/src/main/kotlin/com/fragula2/sample/compose/screen/DetailScreen.kt b/app/src/main/kotlin/com/fragula2/sample/compose/screen/DetailScreen.kt
@@ -226,7 +226,7 @@ fun MessageBox(
                     contentDescription = null,
                     modifier = Modifier
                         .padding(
-                            top = 56.dp, // TODO use column instead
+                            top = 56.dp,
                             start = 8.dp,
                             bottom = 8.dp,
                         )
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,7 +34,7 @@ dependencies {
     }
 }
 
-tasks.register<JavaExec>("ktlint") {
+tasks.register<JavaExec>("ktlintCheck") {
     group = LifecycleBasePlugin.VERIFICATION_GROUP
     description = "Check Kotlin code style."
     classpath = ktlint
diff --git a/fragula-core/src/main/kotlin/com/fragula2/utils/Extensions.kt b/fragula-core/src/main/kotlin/com/fragula2/utils/Extensions.kt
@@ -37,7 +37,9 @@ internal var ViewPager2.pageOverScrollMode: Int
     get() = getChildAt(0).overScrollMode
 
     @RestrictTo(LIBRARY_GROUP)
-    set(value) { getChildAt(0).overScrollMode = value }
+    set(value) {
+        getChildAt(0).overScrollMode = value
+    }
 
 internal var ViewPager2.pageSwipeDirection: SwipeDirection
     @RestrictTo(LIBRARY_GROUP)
diff --git a/gradle.properties b/gradle.properties
@@ -24,5 +24,4 @@ android.useAndroidX=true
 android.enableJetifier=false
 android.nonTransitiveRClass=true
 
-kotlin.code.style=official
-kapt.incremental.apt=true
+kotlin.code.style=official
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -19,7 +19,7 @@ junit = "4.13.2"
 junit-ext = "1.1.5"
 test-runner = "1.5.2"
 test-macrobenchmark = "1.2.1"
-ktlint = "0.50.0"
+ktlint = "1.0.0"
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }
@@ -37,7 +37,7 @@ plugin-kotlin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.
 kotlin = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin" }
 material = { module = "com.google.android.material:material", version.ref = "material" }
 coil = { module = "io.coil-kt:coil", version.ref = "coil" }
-ktlint = { module = "com.pinterest:ktlint", version.ref = "ktlint" }
+ktlint = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
 
 androidx-core = { module = "androidx.core:core-ktx", version.ref = "core" }
 androidx-activity = { module = "androidx.activity:activity-ktx", version.ref = "activity" }

Original file line number	Diff line number	Diff line change
`@@ -226,7 +226,7 @@ fun MessageBox(`
`226`	`226`	`contentDescription = null,`
`227`	`227`	`modifier = Modifier`
`228`	`228`	`.padding(`
`229`		`- top = 56.dp, // TODO use column instead`
	`229`	`+ top = 56.dp,`
`230`	`230`	`start = 8.dp,`
`231`	`231`	`bottom = 8.dp,`
`232`	`232`	`)`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ dependencies {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
`37`		`-tasks.register<JavaExec>("ktlint") {`
	`37`	`+tasks.register<JavaExec>("ktlintCheck") {`
`38`	`38`	`group = LifecycleBasePlugin.VERIFICATION_GROUP`
`39`	`39`	`description = "Check Kotlin code style."`
`40`	`40`	`classpath = ktlint`