From aef0ca9a535070e0e146ca17747162b661a66092 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 9 Apr 2025 13:02:50 -0400 Subject: [PATCH 1/3] misc: prepare codegen packages for internal import --- .brazil.json | 25 ++++++++++++++----- .../build.gradle.kts | 6 +---- gradle.properties | 4 +-- gradle/libs.versions.toml | 2 +- 4 files changed, 23 insertions(+), 14 deletions(-) diff --git a/.brazil.json b/.brazil.json index 56055e11d1..d27fca5c2b 100644 --- a/.brazil.json +++ b/.brazil.json @@ -11,19 +11,31 @@ "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-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", @@ -31,7 +43,8 @@ "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.*": [ diff --git a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts index 96a7442a5c..d2fdef82f4 100644 --- a/codegen/smithy-aws-kotlin-codegen/build.gradle.kts +++ b/codegen/smithy-aws-kotlin-codegen/build.gradle.kts @@ -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) diff --git a/gradle.properties b/gradle.properties index 1cbc070656..dbd0bdb155 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # SDK -sdkVersion=1.4.13-SNAPSHOT +sdkVersion=1.4.13 # codegen -codegenVersion=0.34.13-SNAPSHOT \ No newline at end of file +codegenVersion=0.34.13 \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c3e00661d1..f8871199a4 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" [libraries] aws-kotlin-repo-tools-build-support = { module="aws.sdk.kotlin.gradle:build-support", version.ref = "aws-kotlin-repo-tools-version" } From 8c00c1c4071d8df205b2d5029bc85a5fa57d5174 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 9 Apr 2025 13:08:30 -0400 Subject: [PATCH 2/3] Fix smoke test traits package --- .brazil.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.brazil.json b/.brazil.json index d27fca5c2b..0908ffedb4 100644 --- a/.brazil.json +++ b/.brazil.json @@ -22,7 +22,7 @@ "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-smoke-test-traits-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": { From 19179800cc2ac346930ac1abc8dffb721a9f3b98 Mon Sep 17 00:00:00 2001 From: Matas Lauzadis Date: Wed, 9 Apr 2025 14:20:17 -0400 Subject: [PATCH 3/3] Revert gradle.properties changes --- gradle.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index dbd0bdb155..1cbc070656 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ kotlinx.atomicfu.enableNativeIrTransformation=false org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=1G # SDK -sdkVersion=1.4.13 +sdkVersion=1.4.13-SNAPSHOT # codegen -codegenVersion=0.34.13 \ No newline at end of file +codegenVersion=0.34.13-SNAPSHOT \ No newline at end of file