Skip to content

Commit a6e0b16

Browse files
Lock Smithy to a static version
This updates our Smithy versioning to a single static version that is not synced via gradle properties. The version currently locked in is 1.52.0, which is not the latest, but 1.52.1 has a bug that prevents us from generating protocol tests. Instead of relying on the version range to keep us up to date, we will now be relying on dependabot. It can also track all the different dependency file locations, which removes the need for the syncing via gradle properties.
1 parent 80cc602 commit a6e0b16

File tree

6 files changed

+9
-43
lines changed

6 files changed

+9
-43
lines changed

codegen/gradle.properties

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

codegen/settings.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ pluginManagement {
2626
}
2727
val smithyGradleVersion: String by settings
2828
plugins {
29-
id("software.amazon.smithy.gradle.smithy-base").version(smithyGradleVersion)
29+
id("software.amazon.smithy.gradle.smithy-base").version("1.1.0")
3030
}
3131
}

codegen/smithy-aws-python-codegen/build.gradle.kts

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,7 @@ description = "Generates AWS Python code from Smithy models"
77
extra["displayName"] = "Smithy :: AWS :: Python :: Codegen"
88
extra["moduleName"] = "software.amazon.smithy.aws.python.codegen"
99

10-
val smithyVersion: String by project
11-
12-
buildscript {
13-
val smithyVersion: String by project
14-
15-
repositories {
16-
mavenLocal()
17-
mavenCentral()
18-
}
19-
dependencies {
20-
"classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")
21-
}
22-
}
23-
2410
dependencies {
2511
implementation(project(":smithy-python-codegen"))
26-
implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
12+
implementation("software.amazon.smithy:smithy-aws-traits:1.52.0")
2713
}

codegen/smithy-python-codegen-test/build.gradle.kts

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ repositories {
2626
mavenCentral()
2727
}
2828

29-
val smithyVersion: String by project
30-
3129
dependencies {
3230
implementation(project(":smithy-python-codegen"))
33-
implementation("software.amazon.smithy:smithy-waiters:$smithyVersion")
34-
implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
31+
implementation("software.amazon.smithy:smithy-waiters:1.52.0")
32+
implementation("software.amazon.smithy:smithy-protocol-test-traits:1.52.0")
3533
}

codegen/smithy-python-codegen/build.gradle.kts

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,10 @@ description = "Generates Python code from Smithy models"
1717
extra["displayName"] = "Smithy :: Python :: Codegen"
1818
extra["moduleName"] = "software.amazon.smithy.python.codegen"
1919

20-
val smithyVersion: String by project
21-
22-
buildscript {
23-
val smithyVersion: String by project
24-
25-
repositories {
26-
mavenLocal()
27-
mavenCentral()
28-
}
29-
dependencies {
30-
"classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")
31-
}
32-
}
33-
3420
dependencies {
35-
api("software.amazon.smithy:smithy-codegen-core:$smithyVersion")
36-
implementation("software.amazon.smithy:smithy-waiters:$smithyVersion")
37-
implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
21+
api("software.amazon.smithy:smithy-codegen-core:1.52.0")
22+
implementation("software.amazon.smithy:smithy-waiters:1.52.0")
23+
implementation("software.amazon.smithy:smithy-protocol-test-traits:1.52.0")
3824
// We have this because we're using RestJson1 as a 'generic' protocol.
39-
implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
25+
implementation("software.amazon.smithy:smithy-aws-traits:1.52.0")
4026
}

codegen/smithy-python-protocol-test/build.gradle.kts

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ repositories {
2626
mavenCentral()
2727
}
2828

29-
val smithyVersion: String by project
30-
3129
dependencies {
3230
implementation(project(":smithy-python-codegen"))
33-
implementation("software.amazon.smithy:smithy-aws-protocol-tests:$smithyVersion")
31+
implementation("software.amazon.smithy:smithy-aws-protocol-tests:1.52.0")
3432
}

0 commit comments

Comments
 (0)