From 2e64c23f2ebd75e442b16e98b48a8a8958486095 Mon Sep 17 00:00:00 2001 From: Pierre Millot Date: Wed, 15 Oct 2025 19:01:13 +0200 Subject: [PATCH] fix(clients): switch kotlin formatter to ktfmt --- .github/actions/setup/action.yml | 8 -------- .../algoliasearch-client-kotlin/build.gradle.kts | 9 +-------- templates/kotlin/snippets/build.gradle.mustache | 13 ++----------- tests/output/kotlin/build.gradle.kts | 9 +-------- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/.github/actions/setup/action.yml b/.github/actions/setup/action.yml index 27250ad5a20..94f2000270b 100644 --- a/.github/actions/setup/action.yml +++ b/.github/actions/setup/action.yml @@ -115,14 +115,6 @@ runs: shell: bash run: cd clients/algoliasearch-client-javascript && YARN_ENABLE_HARDENED_MODE=0 YARN_ENABLE_IMMUTABLE_INSTALLS=false yarn install - # Kotlin - - name: Cache spotless - if: ${{ inputs.language == 'kotlin' }} - uses: actions/cache@v4 - with: - path: clients/algoliasearch-client-kotlin/client/build/spotless - key: spotless-${{ hashFiles('clients/algoliasearch-client-kotlin/build.gradle.kts') }} - # PHP - name: Install PHP if: ${{ inputs.language == 'php' }} diff --git a/clients/algoliasearch-client-kotlin/build.gradle.kts b/clients/algoliasearch-client-kotlin/build.gradle.kts index b29beb924ad..3a137bf0b8e 100644 --- a/clients/algoliasearch-client-kotlin/build.gradle.kts +++ b/clients/algoliasearch-client-kotlin/build.gradle.kts @@ -14,14 +14,7 @@ subprojects { configure { kotlin { target("**/*.kt") - ktlint() - .editorConfigOverride( - mapOf( - "ktlint_standard_no-wildcard-imports" to "disabled", - "ktlint_standard_trailing-comma-on-declaration-site" to "disabled", - "ktlint_standard_function-naming" to "disabled", - ), - ) + ktfmt().googleStyle() } } } diff --git a/templates/kotlin/snippets/build.gradle.mustache b/templates/kotlin/snippets/build.gradle.mustache index ceb029a5ca3..39db7b2c0a7 100644 --- a/templates/kotlin/snippets/build.gradle.mustache +++ b/templates/kotlin/snippets/build.gradle.mustache @@ -19,16 +19,7 @@ dependencies { configure { kotlin { - target("**/*.kt") - trimTrailingWhitespace() - ktlint() - .editorConfigOverride( - mapOf( - "ktlint_standard_no-wildcard-imports" to "disabled", - "ktlint_standard_trailing-comma-on-declaration-site" to "disabled", - "ktlint_standard_filename" to "disabled", - "ktlint_standard_import-ordering" to "disabled", - ), - ) + target("**/*.kt") + ktfmt().googleStyle() } } diff --git a/tests/output/kotlin/build.gradle.kts b/tests/output/kotlin/build.gradle.kts index 59d4dcc3382..00e8021c4fa 100644 --- a/tests/output/kotlin/build.gradle.kts +++ b/tests/output/kotlin/build.gradle.kts @@ -75,13 +75,6 @@ tasks.withType { configure { kotlin { target("**/*.kt") - trimTrailingWhitespace() - ktlint() - .editorConfigOverride( - mapOf( - "ktlint_standard_no-wildcard-imports" to "disabled", - "ktlint_standard_trailing-comma-on-declaration-site" to "disabled", - ), - ) + ktfmt().googleStyle() } }