Skip to content

Commit

Permalink
ktlint is running
Browse files Browse the repository at this point in the history
  • Loading branch information
lauzadis committed Jun 26, 2024
1 parent b00efff commit 0950d9b
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
[*.{kt,kts}]
ktlint_code_style = intellij_idea

# ktlint rules to disable
ktlint_standard_no-wildcard-imports = disabled
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
ij_kotlin_allow_trailing_comma = true
1 change: 0 additions & 1 deletion build-plugins/build-support/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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."
Expand Down
2 changes: 0 additions & 2 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
}

Expand Down
3 changes: 1 addition & 2 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -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" }
Expand Down

0 comments on commit 0950d9b

Please sign in to comment.