Skip to content

Commit 5e78870

Browse files
committed
feedback
1 parent 333e207 commit 5e78870

File tree

7 files changed

+18
-54
lines changed

7 files changed

+18
-54
lines changed

build.gradle.kts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,14 @@ val lintPaths = listOf(
107107
)
108108

109109
configureLinting(lintPaths)
110-
configureMinorVersionStrategyRules(lintPaths)
111110

112-
// Set SDK version from gradle.properties as a system property for 'deprecatedApiRule' to use
113-
tasks.withType<JavaExec> {
114-
systemProperty("sdkVersion", findProperty("sdkVersion") ?: throw Exception("sdkVersion not set"))
115-
}
111+
/*
112+
Set SDK version from gradle.properties as a system property for minor versiom strategy ktlint rules
113+
See: https://github.com/aws/aws-kotlin-repo-tools/pull/132
114+
*/
115+
tasks.withType<JavaExec>()
116+
.matching { it.name == "verifyMinorVersionBump" }
117+
.configureEach {
118+
systemProperty("sdkVersion", findProperty("sdkVersion") ?: throw Exception("sdkVersion not set"))
119+
}
120+
configureMinorVersionStrategyRules(lintPaths)

gradle/libs.versions.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ ksp-version = "2.2.0-2.0.2" # Keep in sync with kotlin-version
44

55
dokka-version = "2.0.0"
66

7-
aws-kotlin-repo-tools-version = "0.4.49"
7+
aws-kotlin-repo-tools-version = "8.8.8"
88

99
# libs
1010
coroutines-version = "1.10.2"
@@ -30,7 +30,6 @@ jsoup-version = "1.20.1"
3030

3131
[libraries]
3232
aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }
33-
aws-kotlin-repo-tools-ktlint-rules = { module = "aws.sdk.kotlin.gradle:ktlint-rules", version.ref = "aws-kotlin-repo-tools-version" }
3433

3534
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin-version" }
3635
kotlin-stdlib = { module = "org.jetbrains.kotlin:kotlin-stdlib", version.ref = "kotlin-version" }

ktlint-rules/minor-version-strategy/build.gradle.kts

Lines changed: 0 additions & 18 deletions
This file was deleted.

ktlint-rules/minor-version-strategy/src/main/kotlin/aws/sdk/kotlin/ktlintrules/minorversionstrategy/MinorVersionStrategyRuleSetProvider.kt

Lines changed: 0 additions & 27 deletions
This file was deleted.

ktlint-rules/minor-version-strategy/src/main/resources/META-INF/services/com.pinterest.ktlint.cli.ruleset.core.api.RuleSetProviderV3

Lines changed: 0 additions & 1 deletion
This file was deleted.

settings.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ include(":hll")
5858
include(":hll:hll-codegen")
5959
include(":hll:hll-mapping-core")
6060
include(":services")
61-
include("ktlint-rules:minor-version-strategy")
6261

6362
include(":tests")
6463
include(":tests:codegen")

tests/codegen/checksums/src/test/kotlin/aws/sdk/kotlin/tests/codegen/checksums/ChecksumBusinessMetricsTest.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,13 @@ import aws.smithy.kotlin.runtime.client.config.RequestHttpChecksumConfig
1313
import aws.smithy.kotlin.runtime.client.config.ResponseHttpChecksumConfig
1414
import kotlin.test.Test
1515

16+
// TODO: REMOVE THIS WHEN DONE TESTING
17+
public annotation class DeprecatedUntilVersion(
18+
val major: Int,
19+
val minor: Int,
20+
)
21+
22+
@DeprecatedUntilVersion(1, 6)
1623
class ChecksumBusinessMetricsTest {
1724
@Test
1825
fun defaultConfigBusinessMetrics() = runChecksumTest(

0 commit comments

Comments
 (0)