diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/support/RuleSets.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/support/RuleSets.kt index 8308860e..7b3a1566 100644 --- a/src/main/kotlin/org/jmailen/gradle/kotlinter/support/RuleSets.kt +++ b/src/main/kotlin/org/jmailen/gradle/kotlinter/support/RuleSets.kt @@ -2,15 +2,12 @@ package org.jmailen.gradle.kotlinter.support import com.pinterest.ktlint.core.RuleProvider import com.pinterest.ktlint.core.RuleSetProviderV2 -import com.pinterest.ktlint.ruleset.experimental.ExperimentalRuleSetProvider import java.util.ServiceLoader internal fun resolveRuleProviders( providers: Iterable, - includeExperimentalRules: Boolean = false, ): Set = providers .asSequence() - .filter { includeExperimentalRules || it !is ExperimentalRuleSetProvider } .sortedWith( compareBy { when (it.id) { diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/format/FormatWorkerAction.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/format/FormatWorkerAction.kt index 15b30e16..f4707045 100644 --- a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/format/FormatWorkerAction.kt +++ b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/format/FormatWorkerAction.kt @@ -26,7 +26,7 @@ abstract class FormatWorkerAction : WorkAction { override fun execute() { val ktLintEngine = KtLintRuleEngine( - ruleProviders = resolveRuleProviders(defaultRuleSetProviders, ktLintParams.experimentalRules), + ruleProviders = resolveRuleProviders(defaultRuleSetProviders), editorConfigOverride = editorConfigOverride(ktLintParams), ) diff --git a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/lint/LintWorkerAction.kt b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/lint/LintWorkerAction.kt index a52bf887..54bfe9a0 100644 --- a/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/lint/LintWorkerAction.kt +++ b/src/main/kotlin/org/jmailen/gradle/kotlinter/tasks/lint/LintWorkerAction.kt @@ -31,7 +31,7 @@ abstract class LintWorkerAction : WorkAction { override fun execute() { val ktLintEngine = KtLintRuleEngine( - ruleProviders = resolveRuleProviders(defaultRuleSetProviders, ktLintParams.experimentalRules), + ruleProviders = resolveRuleProviders(defaultRuleSetProviders), editorConfigOverride = editorConfigOverride(ktLintParams), ) diff --git a/src/test/kotlin/org/jmailen/gradle/kotlinter/support/RuleSetsTest.kt b/src/test/kotlin/org/jmailen/gradle/kotlinter/support/RuleSetsTest.kt index 1a595c5a..b06e86d6 100644 --- a/src/test/kotlin/org/jmailen/gradle/kotlinter/support/RuleSetsTest.kt +++ b/src/test/kotlin/org/jmailen/gradle/kotlinter/support/RuleSetsTest.kt @@ -13,11 +13,9 @@ class RuleSetsTest { @Test fun `resolveRuleSets loads from classpath providers`() { - val standardOnly = resolveRuleProviders(defaultRuleSetProviders, includeExperimentalRules = false) - val withExperimentalRules = resolveRuleProviders(defaultRuleSetProviders, includeExperimentalRules = true) + val rules = resolveRuleProviders(defaultRuleSetProviders) - assertTrue(standardOnly.isNotEmpty()) - assertTrue(standardOnly.size < withExperimentalRules.size) + assertTrue(rules.isNotEmpty()) } @Test