Skip to content

Commit

Permalink
Merge pull request #327 from smithy-lang/lock-smithy-version
Browse files Browse the repository at this point in the history
Lock Smithy to a static version
  • Loading branch information
nateprewitt authored Oct 24, 2024
2 parents 80cc602 + a6e0b16 commit fda945a
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 43 deletions.
2 changes: 0 additions & 2 deletions codegen/gradle.properties

This file was deleted.

2 changes: 1 addition & 1 deletion codegen/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ pluginManagement {
}
val smithyGradleVersion: String by settings
plugins {
id("software.amazon.smithy.gradle.smithy-base").version(smithyGradleVersion)
id("software.amazon.smithy.gradle.smithy-base").version("1.1.0")
}
}
16 changes: 1 addition & 15 deletions codegen/smithy-aws-python-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,7 @@ description = "Generates AWS Python code from Smithy models"
extra["displayName"] = "Smithy :: AWS :: Python :: Codegen"
extra["moduleName"] = "software.amazon.smithy.aws.python.codegen"

val smithyVersion: String by project

buildscript {
val smithyVersion: String by project

repositories {
mavenLocal()
mavenCentral()
}
dependencies {
"classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")
}
}

dependencies {
implementation(project(":smithy-python-codegen"))
implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
implementation("software.amazon.smithy:smithy-aws-traits:1.52.0")
}
6 changes: 2 additions & 4 deletions codegen/smithy-python-codegen-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,8 @@ repositories {
mavenCentral()
}

val smithyVersion: String by project

dependencies {
implementation(project(":smithy-python-codegen"))
implementation("software.amazon.smithy:smithy-waiters:$smithyVersion")
implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
implementation("software.amazon.smithy:smithy-waiters:1.52.0")
implementation("software.amazon.smithy:smithy-protocol-test-traits:1.52.0")
}
22 changes: 4 additions & 18 deletions codegen/smithy-python-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,10 @@ description = "Generates Python code from Smithy models"
extra["displayName"] = "Smithy :: Python :: Codegen"
extra["moduleName"] = "software.amazon.smithy.python.codegen"

val smithyVersion: String by project

buildscript {
val smithyVersion: String by project

repositories {
mavenLocal()
mavenCentral()
}
dependencies {
"classpath"("software.amazon.smithy:smithy-cli:$smithyVersion")
}
}

dependencies {
api("software.amazon.smithy:smithy-codegen-core:$smithyVersion")
implementation("software.amazon.smithy:smithy-waiters:$smithyVersion")
implementation("software.amazon.smithy:smithy-protocol-test-traits:$smithyVersion")
api("software.amazon.smithy:smithy-codegen-core:1.52.0")
implementation("software.amazon.smithy:smithy-waiters:1.52.0")
implementation("software.amazon.smithy:smithy-protocol-test-traits:1.52.0")
// We have this because we're using RestJson1 as a 'generic' protocol.
implementation("software.amazon.smithy:smithy-aws-traits:$smithyVersion")
implementation("software.amazon.smithy:smithy-aws-traits:1.52.0")
}
4 changes: 1 addition & 3 deletions codegen/smithy-python-protocol-test/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ repositories {
mavenCentral()
}

val smithyVersion: String by project

dependencies {
implementation(project(":smithy-python-codegen"))
implementation("software.amazon.smithy:smithy-aws-protocol-tests:$smithyVersion")
implementation("software.amazon.smithy:smithy-aws-protocol-tests:1.52.0")
}

0 comments on commit fda945a

Please sign in to comment.