Skip to content

Commit e756233

Browse files
RBusarowkodiakhq[bot]
authored andcommitted
update ktlint configs for breaking changes
1 parent 791c346 commit e756233

File tree

8 files changed

+21
-50
lines changed

8 files changed

+21
-50
lines changed

.editorconfig

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,15 @@ ij_wrap_on_typing = false
2020
############
2121
############ KtLint specific settings
2222
############
23-
# noinspection EditorConfigKeyCorrectness
23+
# noinspection EditorConfigKeyCorrectness,EditorConfigHeaderUniqueness,EditorConfigPartialOverride
2424
[{*.kt,*.kts}]
2525
kotlin_imports_layout = *,java.**,javax.**,kotlin.**,^
2626
# Back-ticked method names are allowed to exceed the line length. That's especially helpful for
2727
# test methods with descriptive names.
2828
ktlint_ignore_back_ticked_identifier = true
2929

3030
kt-rules_project_version = 0.13.0-SNAPSHOT
31+
kt-rules_wrapping_style = equal
3132

3233
ktlint_standard_class-naming = disabled
3334
ktlint_standard_class-signature = disabled
@@ -42,6 +43,7 @@ ktlint_standard_property-naming = disabled
4243
ktlint_experimental = disabled
4344
ktlint_code_style = intellij_idea
4445

46+
# noinspection EditorConfigKeyCorrectness,EditorConfigHeaderUniqueness,EditorConfigPartialOverride
4547
[{*.kt,*.kts}]
4648
ij_continuation_indent_size = 2
4749
ij_kotlin_align_in_columns_case_branch = false

.gitignore

+3-13
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,13 @@ Thumbs.db
3434

3535
# IDEA/Android Studio Ignore exceptions
3636
!/.idea/codeStyleSettings.xml
37-
!/.idea/compiler.xml
37+
!/.idea/codeStyles/
3838
!/.idea/copyright/
39-
!/.idea/dictionaries/*
40-
!/.idea/encodings.xml
39+
!/.idea/detekt.xml
4140
!/.idea/fileTemplates/
4241
!/.idea/icon.png
4342
!/.idea/inspectionProfiles/
44-
!/.idea/detekt.xml
45-
!/.idea/ktlint.xml
43+
!/.idea/ktlint-plugin.xml
4644
!/.idea/scopes/
4745

4846
/gradle/profiler/gradle-user-home/
@@ -55,14 +53,6 @@ obj/
5553
/.idea/vcs.xml
5654
captures/
5755
java_pid1690.hprof
58-
/.idea/compiler.xml
59-
!/.idea/codeStyles/
60-
!/gradle/wrapper/gradle-wrapper.properties
61-
true/
62-
63-
.cache-proxy/*
64-
libs/
65-
/buildSrc/.gradle/
6656

6757
# all build dirs at any level
6858
**/build

.idea/dictionaries/rbusarow.xml

-12
This file was deleted.

.idea/ktlint-plugin.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/ktlint.xml

-13
This file was deleted.

build-logic/conventions/src/main/kotlin/modulecheck/builds/KtLintConventionPlugin.kt

+4-6
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
*/
1515
package modulecheck.builds
1616

17-
import com.rickbusarow.kgx.EagerGradleApi
1817
import com.rickbusarow.kgx.isRealRootProject
19-
import com.rickbusarow.kgx.matchingName
18+
import com.rickbusarow.kgx.namedOrNull
2019
import com.rickbusarow.ktlint.KtLintPlugin
2120
import com.rickbusarow.ktlint.KtLintTask
2221
import kotlinx.validation.KotlinApiBuildTask
@@ -33,13 +32,12 @@ abstract class KtLintConventionPlugin : Plugin<Project> {
3332
target.dependencies
3433
.add("ktlint", target.libs.rickBusarow.ktrules)
3534

36-
@OptIn(EagerGradleApi::class)
3735
target.tasks.withType(KtLintTask::class.java).configureEach { task ->
3836
task.dependsOn(":updateEditorConfigVersion")
3937
task.mustRunAfter(
40-
target.tasks.matchingName("apiDump"),
41-
target.tasks.matchingName("dependencyGuard"),
42-
target.tasks.matchingName("dependencyGuardBaseline"),
38+
target.tasks.namedOrNull("apiDump"),
39+
target.tasks.namedOrNull("dependencyGuard"),
40+
target.tasks.namedOrNull("dependencyGuardBaseline"),
4341
target.tasks.withType(KotlinApiBuildTask::class.java),
4442
target.tasks.withType(KotlinApiCompareTask::class.java)
4543
)

gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ rickBusarow-dispatch = "1.0.0-beta10"
6969
rickBusarow-doks = "0.1.4"
7070
rickBusarow-kase = "0.7.0"
7171
rickBusarow-kgx = "0.1.10"
72-
rickBusarow-ktlint = "0.1.8"
73-
rickBusarow-ktrules = "1.1.4"
72+
rickBusarow-ktlint = "0.2.2"
73+
rickBusarow-ktrules = "1.3.1"
7474
rickBusarow-moduleCheck = "0.12.5"
7575
rickBusarow-tangle = "0.15.1"
7676
semVer = "1.3.0"

project.dic

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
Busarow/S
22
Downstreams
33
Kotest
4-
Kotlinter/S
5-
Threeten
64
UPPERFLATCASE
75
ajalt
86
arturbosch
97
burrunan
108
busarow
119
cacheability
1210
clikt
11+
databinding
1312
decapitalization
1413
decapitalize
1514
doks
1615
flatcase
1716
interpunct/S
18-
jmailen
1917
johnrengelman
2018
kase
2119
kotest
2220
ktlint
21+
mcbuild
2322
modulecheck
23+
rbusarow
2424
reactivecircus
2525
rickbusarow
2626
sourceset

0 commit comments

Comments
 (0)