misc: fix custom ktlint rules

Author: 0marperez

build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/CodeStyle.kt

@@ -15,7 +15,7 @@ import org.gradle.language.base.plugins.LifecycleBasePlugin
  * Configure lint rules for the project
  * @param lintPaths list of paths relative to the project root to lint (or not lint).
  */
-fun Project.configureLinting(lintPaths: List<String>) {
+fun Project.configureLinting(lintPaths: List<String>, repoToolsVersion: String) {
     verifyRootProject { "Kotlin SDK lint configuration is expected to be configured on the root project" }
 
     val ktlintVersion = object {} // Can't use Project.javaClass because that's using the Gradle classloader
@@ -32,6 +32,7 @@ fun Project.configureLinting(lintPaths: List<String>) {
                 attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.SHADOWED))
             }
         }
+        ktlint("aws.sdk.kotlin.gradle:ktlint-rules:$repoToolsVersion")
     }
 
     // add the buildscript classpath which should pick up our custom ktlint-rules (via runtimeOnly dep on this plugin)

ktlint-rules/src/main/kotlin/software/aws/ktlint/rules/CopyrightHeaderRule.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.com.intellij.psi.impl.source.tree.PsiCommentImpl
 import org.jetbrains.kotlin.lexer.KtTokens
 import org.jetbrains.kotlin.psi.stubs.elements.KtFileElementType
 
-class CopyrightHeaderRule : Rule(RuleId("copyright-header"), About()) {
+class CopyrightHeaderRule : Rule(RuleId("custom-ktlint-rules:copyright-header"), About()) {
     companion object {
         private val header = """
         /*

ktlint-rules/src/main/kotlin/software/aws/ktlint/rules/ExpressionBodyRule.kt

@@ -11,7 +11,7 @@ import org.jetbrains.kotlin.psi.KtBlockExpression
 import org.jetbrains.kotlin.psi.KtNamedFunction
 import org.jetbrains.kotlin.psi.KtReturnExpression
 
-class ExpressionBodyRule : Rule(RuleId("expression-body"), About()) {
+class ExpressionBodyRule : Rule(RuleId("custom-ktlint-rules:expression-body"), About()) {
     override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,

ktlint-rules/src/main/kotlin/software/aws/ktlint/rules/MultilineIfElseBlockRule.kt

@@ -9,7 +9,7 @@ import com.pinterest.ktlint.rule.engine.core.api.Rule
 import com.pinterest.ktlint.rule.engine.core.api.RuleId
 import org.jetbrains.kotlin.com.intellij.lang.ASTNode
 
-class MultilineIfElseBlockRule : Rule(RuleId("multiline-if-else-block"), About()) {
+class MultilineIfElseBlockRule : Rule(RuleId("custom-ktlint-rules:multiline-if-else-block"), About()) {
     override fun beforeVisitChildNodes(
         node: ASTNode,
         autoCorrect: Boolean,