From 0950d9b4528eae91c115f66d600c9247c6793089 Mon Sep 17 00:00:00 2001
From: Matas Lauzadis <lauzmata@amazon.com>
Date: Wed, 26 Jun 2024 08:31:55 -0500
Subject: [PATCH] ktlint is running

---
 .editorconfig                                        |  6 +++---
 build-plugins/build-support/build.gradle.kts         |  1 -
 .../kotlin/aws/sdk/kotlin/gradle/dsl/CodeStyle.kt    | 12 ++++++++----
 build.gradle.kts                                     |  2 --
 gradle/libs.versions.toml                            |  3 +--
 ...2 => com.pinterest.ktlint.core.RuleSetProviderV3} |  0
 6 files changed, 12 insertions(+), 12 deletions(-)
 rename ktlint-rules/src/main/resources/META-INF/services/{com.pinterest.ktlint.core.RuleSetProviderV2 => com.pinterest.ktlint.core.RuleSetProviderV3} (100%)

diff --git a/.editorconfig b/.editorconfig
index b814d53..46495f9 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,4 +1,6 @@
 [*.{kt,kts}]
+ktlint_code_style = intellij_idea
+
 # ktlint rules to disable
 ktlint_standard_no-wildcard-imports = disabled
 ktlint_standard_filename = disabled
@@ -6,6 +8,4 @@ ktlint_standard_filename = disabled
 # enable trailing commas per JetBrains recommendation
 # (https://kotlinlang.org/docs/coding-conventions.html#trailing-commas)
 ij_kotlin_allow_trailing_comma_on_call_site = true
-ij_kotlin_allow_trailing_comma = true
-
-ktlint_code_style = intellij_idea
\ No newline at end of file
+ij_kotlin_allow_trailing_comma = true
\ No newline at end of file
diff --git a/build-plugins/build-support/build.gradle.kts b/build-plugins/build-support/build.gradle.kts
index 93f8622..e76fcbf 100644
--- a/build-plugins/build-support/build.gradle.kts
+++ b/build-plugins/build-support/build.gradle.kts
@@ -25,7 +25,6 @@ dependencies {
     implementation("aws.sdk.kotlin:s3:1.1.+")
     implementation("aws.sdk.kotlin:cloudwatch:1.1.+")
     testImplementation(libs.junit.jupiter)
-    kotlin(libs.ktlint.toString())
 }
 
 gradlePlugin {
diff --git a/build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/CodeStyle.kt b/build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/CodeStyle.kt
index bd01d16..c261f4d 100644
--- a/build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/CodeStyle.kt
+++ b/build-plugins/build-support/src/main/kotlin/aws/sdk/kotlin/gradle/dsl/CodeStyle.kt
@@ -8,6 +8,7 @@ import aws.sdk.kotlin.gradle.util.verifyRootProject
 import org.gradle.api.Project
 import org.gradle.api.attributes.Bundling
 import org.gradle.api.tasks.JavaExec
+import org.gradle.kotlin.dsl.dependencies
 import org.gradle.kotlin.dsl.named
 import org.gradle.kotlin.dsl.register
 
@@ -24,12 +25,15 @@ fun Project.configureLinting(lintPaths: List<String>) {
         }
     }
 
+    // TODO - is there anyway to align this with the version from libs.versions.toml in this project/repo
+    val ktlintVersion = "1.3.0"
+    dependencies {
+        ktlint("com.pinterest.ktlint:ktlint-cli:$ktlintVersion")
+    }
+
     // add the buildscript classpath which should pickup our custom ktlint-rules (via runtimeOnly dep on this plugin)
     // plus any custom rules added by consumer
-    val execKtlintClasspath = ktlint + buildscript.configurations.getByName("classpath").filter {
-        true
-//        !it.path.contains("ch.qos.logback/logback-classic") <----- Possible next step ?
-    }
+    val execKtlintClasspath = ktlint + buildscript.configurations.getByName("classpath")
 
     tasks.register<JavaExec>("ktlint") {
         description = "Check Kotlin code style."
diff --git a/build.gradle.kts b/build.gradle.kts
index 1b042f2..5cdac32 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -48,12 +48,10 @@ fun propertyOrEnv(propName: String, envName: String): String? {
 val ktlint by configurations.creating {
     attributes {
         attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.EXTERNAL))
-        attribute(Bundling.BUNDLING_ATTRIBUTE, objects.named(Bundling.SHADOWED))
     }
 }
 
 dependencies {
-    ktlint(libs.ktlint.cli)
     ktlint(project(":ktlint-rules"))
 }
 
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index f52a2dd..b26f7ac 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,11 +1,10 @@
 [versions]
-ktlint = "1.2.1"
+ktlint = "1.3.0"
 smithy-version = "1.42.0"
 smithy-gradle-plugin-version = "0.9.0"
 junit-version = "5.10.1"
 
 [libraries]
-ktlint = { module = "com.pinterest.ktlint:ktlint", version.ref = "ktlint" }
 ktlint-cli = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint" }
 ktlint-rule-engine-core = { module = "com.pinterest.ktlint:ktlint-rule-engine-core", version.ref = "ktlint" }
 ktlint-cli-ruleset-core = { module = "com.pinterest.ktlint:ktlint-cli-ruleset-core", version.ref = "ktlint" }
diff --git a/ktlint-rules/src/main/resources/META-INF/services/com.pinterest.ktlint.core.RuleSetProviderV2 b/ktlint-rules/src/main/resources/META-INF/services/com.pinterest.ktlint.core.RuleSetProviderV3
similarity index 100%
rename from ktlint-rules/src/main/resources/META-INF/services/com.pinterest.ktlint.core.RuleSetProviderV2
rename to ktlint-rules/src/main/resources/META-INF/services/com.pinterest.ktlint.core.RuleSetProviderV3