From f58c0f4b7c915ea70dbd9dfa14fe236600580897 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Sep 2024 01:19:17 +0000 Subject: [PATCH 1/2] fix(deps): update dependency org.ec4j.core:ec4j-core to v1 --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 08fd374aed..a20f5371b0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -18,7 +18,7 @@ kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version. kotlin-plugin-dev = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlinDev" } clikt = "com.github.ajalt.clikt:clikt:4.4.0" dokka = "org.jetbrains.dokka:dokka-gradle-plugin:1.9.20" -ec4j = "org.ec4j.core:ec4j-core:0.3.0" +ec4j = "org.ec4j.core:ec4j-core:1.0.0" logging = "io.github.oshai:kotlin-logging-jvm:7.0.0" slf4j = "org.slf4j:slf4j-simple:2.0.16" poko = "dev.drewhamilton.poko:poko-gradle-plugin:0.17.1" From b8f235f8789ffe0a047fe03c601b931ce3f8044a Mon Sep 17 00:00:00 2001 From: Paul Dingemans Date: Fri, 4 Oct 2024 15:56:15 +0200 Subject: [PATCH 2/2] Force the map returned from ec4j to be mutable --- .../pinterest/ktlint/rule/engine/internal/EditorConfigLoader.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/ktlint-rule-engine/src/main/kotlin/com/pinterest/ktlint/rule/engine/internal/EditorConfigLoader.kt b/ktlint-rule-engine/src/main/kotlin/com/pinterest/ktlint/rule/engine/internal/EditorConfigLoader.kt index 7ac58a6c98..d0258813cf 100644 --- a/ktlint-rule-engine/src/main/kotlin/com/pinterest/ktlint/rule/engine/internal/EditorConfigLoader.kt +++ b/ktlint-rule-engine/src/main/kotlin/com/pinterest/ktlint/rule/engine/internal/EditorConfigLoader.kt @@ -61,6 +61,7 @@ internal class EditorConfigLoader( createResourcePropertiesService(editorConfigLoaderEc4j.editorConfigLoader, editorConfigDefaults) .queryProperties(editorConfigPath.resource()) .properties + .toMutableMap() return editorConfigProperties .also { properties -> if (properties[TAB_WIDTH_PROPERTY_NAME]?.sourceValue == properties[INDENT_SIZE_PROPERTY.name]?.sourceValue &&