load all RuleSetProviderV3 from the classpath in ktlint 49+

fixes #697 and #695
JLLeitschuh · Aug 3, 2023 · a145c65 · a145c65
1 parent 840e72e
commit a145c65
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
 
 ## [Unreleased]
 
+-   Fix custom rulesets not loading from classpath [#698](https://github.com/JLLeitschuh/ktlint-gradle/pull/698)
 -   update latest version text file manually [#688](https://github.com/JLLeitschuh/ktlint-gradle/pull/688)
 
 ## [11.5.0] - 2023-07-03

diff --git a/plugin/src/adapter49/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintInvocation49.kt b/plugin/src/adapter49/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintInvocation49.kt
@@ -1,21 +1,30 @@
 package org.jlleitschuh.gradle.ktlint.worker
 
+import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3
 import com.pinterest.ktlint.rule.engine.api.Code
 import com.pinterest.ktlint.rule.engine.api.KtLintRuleEngine
 import com.pinterest.ktlint.rule.engine.api.LintError
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider
+import com.pinterest.ktlint.rule.engine.core.api.RuleProvider
 import java.io.File
+import java.util.ServiceLoader
 
 class KtLintInvocation49(
     private val engine: KtLintRuleEngine
 ) : KtLintInvocation {
     companion object Factory : KtLintInvocationFactory {
         fun initialize(): KtLintInvocation {
             val engine = KtLintRuleEngine(
-                ruleProviders = StandardRuleSetProvider().getRuleProviders()
+                ruleProviders = loadRuleSetsFromClasspathWithRuleSetProviderV3()
             )
             return KtLintInvocation49(engine)
         }
+
+        private fun loadRuleSetsFromClasspathWithRuleSetProviderV3(): Set<RuleProvider> {
+            return ServiceLoader
+                .load(RuleSetProviderV3::class.java)
+                .flatMap { it.getRuleProviders() }
+                .toSet()
+        }
     }
 
     override fun invokeLint(file: File): LintErrorResult {

diff --git a/plugin/src/adapter50/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintInvocation50.kt b/plugin/src/adapter50/kotlin/org/jlleitschuh/gradle/ktlint/worker/KtLintInvocation50.kt
@@ -1,21 +1,30 @@
 package org.jlleitschuh.gradle.ktlint.worker
 
+import com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3
 import com.pinterest.ktlint.rule.engine.api.Code
 import com.pinterest.ktlint.rule.engine.api.KtLintRuleEngine
 import com.pinterest.ktlint.rule.engine.api.LintError
-import com.pinterest.ktlint.ruleset.standard.StandardRuleSetProvider
+import com.pinterest.ktlint.rule.engine.core.api.RuleProvider
 import java.io.File
+import java.util.ServiceLoader
 
 class KtLintInvocation50(
     private val engine: KtLintRuleEngine
 ) : KtLintInvocation {
     companion object Factory : KtLintInvocationFactory {
         fun initialize(): KtLintInvocation {
             val engine = KtLintRuleEngine(
-                ruleProviders = StandardRuleSetProvider().getRuleProviders()
+                ruleProviders = loadRuleSetsFromClasspathWithRuleSetProviderV3()
             )
             return KtLintInvocation50(engine)
         }
+
+        private fun loadRuleSetsFromClasspathWithRuleSetProviderV3(): Set<RuleProvider> {
+            return ServiceLoader
+                .load(RuleSetProviderV3::class.java)
+                .flatMap { it.getRuleProviders() }
+                .toSet()
+        }
     }
 
     override fun invokeLint(file: File): LintErrorResult {