Skip to content

Commit bb110a3

Browse files
authored
fix(clients): switch kotlin formatter to ktfmt (#5483)
1 parent 9622cce commit bb110a3

File tree

4 files changed

+4
-35
lines changed

4 files changed

+4
-35
lines changed

.github/actions/setup/action.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,6 @@ runs:
115115
shell: bash
116116
run: cd clients/algoliasearch-client-javascript && YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install
117117

118-
# Kotlin
119-
- name: Cache spotless
120-
if: ${{ inputs.language == 'kotlin' }}
121-
uses: actions/cache@v4
122-
with:
123-
path: clients/algoliasearch-client-kotlin/client/build/spotless
124-
key: spotless-${{ hashFiles('clients/algoliasearch-client-kotlin/build.gradle.kts') }}
125-
126118
# PHP
127119
- name: Install PHP
128120
if: ${{ inputs.language == 'php' }}

clients/algoliasearch-client-kotlin/build.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,7 @@ subprojects {
1414
configure<SpotlessExtension> {
1515
kotlin {
1616
target("**/*.kt")
17-
ktlint()
18-
.editorConfigOverride(
19-
mapOf(
20-
"ktlint_standard_no-wildcard-imports" to "disabled",
21-
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
22-
"ktlint_standard_function-naming" to "disabled",
23-
),
24-
)
17+
ktfmt().googleStyle()
2518
}
2619
}
2720
}

templates/kotlin/snippets/build.gradle.mustache

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,7 @@ dependencies {
1919

2020
configure<SpotlessExtension> {
2121
kotlin {
22-
target("**/*.kt")
23-
trimTrailingWhitespace()
24-
ktlint()
25-
.editorConfigOverride(
26-
mapOf(
27-
"ktlint_standard_no-wildcard-imports" to "disabled",
28-
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
29-
"ktlint_standard_filename" to "disabled",
30-
"ktlint_standard_import-ordering" to "disabled",
31-
),
32-
)
22+
target("**/*.kt")
23+
ktfmt().googleStyle()
3324
}
3425
}

tests/output/kotlin/build.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -75,13 +75,6 @@ tasks.withType<Test> {
7575
configure<SpotlessExtension> {
7676
kotlin {
7777
target("**/*.kt")
78-
trimTrailingWhitespace()
79-
ktlint()
80-
.editorConfigOverride(
81-
mapOf(
82-
"ktlint_standard_no-wildcard-imports" to "disabled",
83-
"ktlint_standard_trailing-comma-on-declaration-site" to "disabled",
84-
),
85-
)
78+
ktfmt().googleStyle()
8679
}
8780
}

0 commit comments

Comments
 (0)