updat Ktlint to support Kotlin 1.7

kiwicom · Jun 30, 2022 · 68506c8 · 68506c8
1 parent 2a248fd
commit 68506c8
Show file tree

Hide file tree

Showing 14 changed files with 19 additions and 9 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -1,2 +1,4 @@
 [*.{kt,kts}]
 ij_kotlin_imports_layout=*,^
+ij_kotlin_allow_trailing_comma=true
+ij_kotlin_allow_trailing_comma_on_call_site=true
diff --git a/catalog/build.gradle.kts b/catalog/build.gradle.kts
@@ -81,7 +81,7 @@ android {
 kotlinter {
     reporters = arrayOf("json")
     experimentalRules = true
-    disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
+    disabledRules = arrayOf("trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
 }
 
 dependencies {

diff --git a/generator/build.gradle.kts b/generator/build.gradle.kts
@@ -15,7 +15,7 @@ java {
 kotlinter {
     reporters = arrayOf("json")
     experimentalRules = true
-    disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
+    disabledRules = arrayOf("trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
 }
 
 dependencies {
@@ -27,16 +27,16 @@ dependencies {
 }
 
 tasks.register<JavaExec>("colors") {
-    mainClass.set("kiwi.orbit.compose.generator.colors.RunnerKt")
+    mainClass.set("kiwi.orbit.compose.generator.colors.MainKt")
     classpath = sourceSets.getByName("main").runtimeClasspath
 }
 
 tasks.register<JavaExec>("icons") {
-    mainClass.set("kiwi.orbit.compose.generator.icons.RunnerKt")
+    mainClass.set("kiwi.orbit.compose.generator.icons.MainKt")
     classpath = sourceSets.getByName("main").runtimeClasspath
 }
 
 tasks.register<JavaExec>("illustrations") {
-    mainClass.set("kiwi.orbit.compose.generator.illustrations.RunnerKt")
+    mainClass.set("kiwi.orbit.compose.generator.illustrations.MainKt")
     classpath = sourceSets.getByName("main").runtimeClasspath
 }
diff --git a/.../orbit/compose/generator/colors/runner.kt → ...wi/orbit/compose/generator/colors/Main.kt b/.../orbit/compose/generator/colors/runner.kt → ...wi/orbit/compose/generator/colors/Main.kt
diff --git a/...i/orbit/compose/generator/icons/runner.kt → ...iwi/orbit/compose/generator/icons/Main.kt b/...i/orbit/compose/generator/icons/runner.kt → ...iwi/orbit/compose/generator/icons/Main.kt
diff --git a/...compose/generator/illustrations/runner.kt → ...t/compose/generator/illustrations/Main.kt b/...compose/generator/illustrations/runner.kt → ...t/compose/generator/illustrations/Main.kt
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -56,5 +56,5 @@ square-kotlinPoet = { module = "com.squareup:kotlinpoet", version.ref = "square-
 [bundles]
 
 [plugins]
-kotlinter = { id = "org.jmailen.kotlinter", version = "3.10.0" }
+kotlinter = { id = "org.jmailen.kotlinter", version = "3.11.1" }
 paparazzi = { id = "app.cash.paparazzi", version = "1.0.0" }
diff --git a/icons/build.gradle.kts b/icons/build.gradle.kts
@@ -48,7 +48,7 @@ android {
 kotlinter {
     reporters = arrayOf("json")
     experimentalRules = true
-    disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
+    disabledRules = arrayOf("trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
 }
 
 dependencies {

diff --git a/illustrations/build.gradle.kts b/illustrations/build.gradle.kts
@@ -45,7 +45,7 @@ android {
 kotlinter {
     reporters = arrayOf("json")
     experimentalRules = true
-    disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
+    disabledRules = arrayOf("trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
 }
 
 dependencies {

diff --git a/ui/build.gradle.kts b/ui/build.gradle.kts
@@ -50,7 +50,7 @@ android {
 kotlinter {
     reporters = arrayOf("json")
     experimentalRules = true
-    disabledRules = arrayOf("experimental:trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
+    disabledRules = arrayOf("trailing-comma") // https://github.com/pinterest/ktlint/issues/1367 ?
 }
 
 dependencies {

diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/foundation/ColorBundleGradient.kt b/ui/src/main/java/kiwi/orbit/compose/ui/foundation/ColorBundleGradient.kt
@@ -1,3 +1,5 @@
+// ktlint-disable filename
+
 package kiwi.orbit.compose.ui.foundation
 
 import androidx.compose.ui.geometry.Offset

diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/foundation/TextSelectionColors.kt b/ui/src/main/java/kiwi/orbit/compose/ui/foundation/TextSelectionColors.kt
@@ -1,3 +1,5 @@
+// ktlint-disable filename
+
 package kiwi.orbit.compose.ui.foundation
 
 import androidx.compose.foundation.text.selection.TextSelectionColors

diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/layout/ExpandModifier.kt b/ui/src/main/java/kiwi/orbit/compose/ui/layout/ExpandModifier.kt
@@ -1,3 +1,5 @@
+// ktlint-disable filename
+
 package kiwi.orbit.compose.ui.layout
 
 import androidx.compose.ui.Modifier

diff --git a/ui/src/main/java/kiwi/orbit/compose/ui/utils/PaddingValuesExtensions.kt b/ui/src/main/java/kiwi/orbit/compose/ui/utils/PaddingValuesExtensions.kt
@@ -1,3 +1,5 @@
+// ktlint-disable filename
+
 package kiwi.orbit.compose.ui.utils
 
 import androidx.compose.foundation.layout.PaddingValues