Skip to content

misc: prepare codegen packages for internal import #1266

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 9, 2025
Merged

misc: prepare codegen packages for internal import #1266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aef0ca9
misc: prepare codegen packages for internal import
lauzadis Apr 9, 2025
8c00c1c
Fix smoke test traits package
lauzadis Apr 9, 2025
1917980
Revert gradle.properties changes
lauzadis Apr 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 19 additions & 6 deletions .brazil.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,40 @@
"org.slf4j:slf4j-api:2.*": "Maven-org-slf4j_slf4j-api-2.x",
"aws.sdk.kotlin.crt:aws-crt-kotlin:0.9.*": "AwsCrtKotlin-0.9.x",
"aws.sdk.kotlin.crt:aws-crt-kotlin:0.8.*": "AwsCrtKotlin-0.8.x",
"com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x"
"com.squareup.okhttp3:okhttp:4.*": "OkHttp3-4.x",

"software.amazon.smithy:smithy-aws-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-traits-1.x",
"software.amazon.smithy:smithy-aws-iam-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-iam-traits-1.x",
"software.amazon.smithy:smithy-aws-cloudformation-traits:1.*": "Maven-software-amazon-smithy_smithy-aws-cloudformation-traits-1.x",
"software.amazon.smithy:smithy-protocol-test-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-test-traits-1.x",
"software.amazon.smithy:smithy-protocol-traits:1.*": "Maven-software-amazon-smithy_smithy-protocol-traits-1.x",
"software.amazon.smithy:smithy-aws-endpoints:1.*": "Maven-software-amazon-smithy_smithy-aws-endpoints-1.x",
"software.amazon.smithy:smithy-codegen-core:1.*": "Maven-software-amazon-smithy_smithy-codegen-core-1.x",
"software.amazon.smithy:smithy-waiters:1.*": "Maven-software-amazon-smithy_smithy-waiters-1.x",
"software.amazon.smithy:smithy-rules-engine:1.*": "Maven-software-amazon-smithy_smithy-rules-engine-1.x",
"software.amazon.smithy:smithy-smoke-test-traits:1.*": "Maven-software-amazon-smithy_smithy-smoke-test-traits-1.x",
"org.jsoup:jsoup:1.19.*": "Maven-jsoup-1.19.x"
},
"packageHandlingRules": {
"versioning": {
"defaultVersionLayout": "{MAJOR}.0.x",
"overrides": {
"software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.{MINOR}.x",
"software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils": "{MAJOR}.{MINOR}.x"
"software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "{MAJOR}.x",
"software.amazon.smithy.kotlin:smithy-kotlin-codegen": "{MAJOR}.x"
}
},
"rename": {
"software.amazon.smithy.kotlin:smithy-kotlin-codegen": "SmithyKotlinCodegen",
"software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils": "SmithyKotlinCodegenTestUtils"
"software.amazon.smithy.kotlin:smithy-aws-kotlin-codegen": "AwsSmithyAwsKotlinCodegen",
"software.amazon.smithy.kotlin:smithy-kotlin-codegen": "AwsSmithyKotlinCodegen"
},
"ignore": [
"aws.smithy.kotlin:http-test",
"aws.smithy.kotlin:smithy-test",
"aws.smithy.kotlin:telemetry-provider-micrometer",
"aws.smithy.kotlin:testing",
"aws.smithy.kotlin:bom",
"aws.smithy.kotlin:version-catalog"
"aws.smithy.kotlin:version-catalog",
"software.amazon.smithy.kotlin:smithy-kotlin-codegen-testutils"
],
"resolvesConflictDependencies": {
"org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.*": [
Expand Down
6 changes: 1 addition & 5 deletions codegen/smithy-aws-kotlin-codegen/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,11 @@ plugins {
}

val codegenVersion: String by project
description = "Codegen support for AWS protocols"
description = "Smithy codegen support for AWS protocols"
group = "software.amazon.smithy.kotlin"
version = codegenVersion

val sdkVersion: String by project

dependencies {

implementation(libs.kotlin.stdlib.jdk8)
api(project(":codegen:smithy-kotlin-codegen"))

api(libs.smithy.aws.traits)
Expand Down
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ kotlinx-serialization-version = "1.7.3"
docker-java-version = "3.4.0"
ktor-version = "3.1.1"
kaml-version = "0.55.0"
jsoup-version = "1.18.1"
jsoup-version = "1.19.1"
Copy link
Contributor

@ianbotsf ianbotsf Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Question: Why was this change necessary?

Copy link
Contributor Author

@lauzadis lauzadis Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It wasn't necessary but internally we have a choice of 1.18.3 or 1.19.1 (which is the latest version). I chose to upgrade to the latest

Copy link
Contributor Author

@lauzadis lauzadis Apr 9, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ideally we would just remove this dependency, I took a quick attempt but it's deeply entangled in our documentation preprocessor. There's no alternative API offered by Kotlin / another one of our existing dependencies


[libraries]
aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" }
Expand Down
Loading