fixed merge issue + marked as deprecated DiktatJavaExecTaskBase

saveourtool · Mar 30, 2023 · bb1a81e · bb1a81e
1 parent 4ee2417
commit bb1a81e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskBase.kt b/diktat-gradle-plugin/src/main/kotlin/org/cqfn/diktat/plugin/gradle/DiktatJavaExecTaskBase.kt
@@ -5,4 +5,5 @@ import org.gradle.api.Task
 /**
  * An interface with old name for base class for backward compatibility in plugin configuration
  */
+@Deprecated("will be removed in 2.x")
 interface DiktatJavaExecTaskBase : Task
diff --git a/...unner/diktat-runner-ktlint-engine/src/main/kotlin/org/cqfn/diktat/DiktatProcessCommand.kt b/...unner/diktat-runner-ktlint-engine/src/main/kotlin/org/cqfn/diktat/DiktatProcessCommand.kt
@@ -2,6 +2,7 @@ package org.cqfn.diktat
 
 import org.cqfn.diktat.api.DiktatCallback
 import org.cqfn.diktat.api.DiktatLogLevel
+import org.cqfn.diktat.ktlint.KtLintRuleSetProviderWrapper.Companion.toKtLint
 import org.cqfn.diktat.ktlint.unwrap
 import com.pinterest.ktlint.core.KtLint
 import com.pinterest.ktlint.core.api.EditorConfigOverride
@@ -46,7 +47,7 @@ class DiktatProcessCommand private constructor(
     private fun ktLintParams(): KtLint.ExperimentalParams = KtLint.ExperimentalParams(
         fileName = file.absolutePathString(),
         text = fileContent,
-        ruleSets = setOf(processor.diktatRuleSetProvider.get()),
+        ruleSets = setOf(processor.diktatRuleSetProvider.toKtLint().get()),
         userData = emptyMap(),
         cb = callback.unwrap(),
         script = isScript,