From 4b146cc765964d5df1728151abfbb662e4951aa9 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Thu, 11 Sep 2025 02:01:28 +0000 Subject: [PATCH 1/5] fix(codegen): 'getter for buildDir: File!' is deprecated --- codegen/build.gradle.kts | 10 +++++++--- codegen/smithy-aws-typescript-codegen/build.gradle.kts | 8 +++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/codegen/build.gradle.kts b/codegen/build.gradle.kts index 0a05423e7fcfc..757c0872c3f71 100644 --- a/codegen/build.gradle.kts +++ b/codegen/build.gradle.kts @@ -125,7 +125,7 @@ subprojects { repositories { maven { name = "stagingRepository" - url = uri("${rootProject.buildDir}/staging") + url = rootProject.layout.buildDirectory.dir("staging").get().asFile.toURI() } } @@ -217,7 +217,9 @@ subprojects { reports { xml.required.set(false) csv.required.set(false) - html.outputLocation.set(file("$buildDir/reports/jacoco")) + html.outputLocation.set( + layout.buildDirectory.dir("reports/jacoco").get().asFile + ) } } @@ -288,7 +290,9 @@ jreleaser { create("maven-central") { active = Active.ALWAYS url = "https://central.sonatype.com/api/v1/publisher" - stagingRepositories.add("${rootProject.buildDir}/staging") + stagingRepositories.add( + rootProject.layout.buildDirectory.dir("staging").get().asFile.absolutePath + ) } } } diff --git a/codegen/smithy-aws-typescript-codegen/build.gradle.kts b/codegen/smithy-aws-typescript-codegen/build.gradle.kts index 66c9664de997e..e743b6242871b 100644 --- a/codegen/smithy-aws-typescript-codegen/build.gradle.kts +++ b/codegen/smithy-aws-typescript-codegen/build.gradle.kts @@ -53,9 +53,11 @@ dependencies { tasks.register("set-aws-sdk-versions") { doLast { - mkdir("$buildDir/generated/resources/software/amazon/smithy/aws/typescript/codegen") - var versionsFile = - file("$buildDir/generated/resources/software/amazon/smithy/aws/typescript/codegen/sdkVersions.properties") + mkdir(layout.buildDirectory.dir("generated/resources/software/amazon/smithy/aws/typescript/codegen").get().asFile) + var versionsFile = layout.buildDirectory + .file("generated/resources/software/amazon/smithy/aws/typescript/codegen/sdkVersions.properties") + .get() + .asFile versionsFile.printWriter().close() var roots = project.file("../../packages").listFiles().toMutableList() + project.file("../../clients").listFiles().toList() From 124c1077bc7756dd00043afbacb2c5300cd2d868 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Thu, 11 Sep 2025 02:27:06 +0000 Subject: [PATCH 2/5] fix(codegen): 'create(String, noinline T.() -> Unit): T' is deprecated --- codegen/generic-client-test-codegen/build.gradle.kts | 2 +- codegen/protocol-test-codegen/build.gradle.kts | 2 +- codegen/sdk-codegen/build.gradle.kts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codegen/generic-client-test-codegen/build.gradle.kts b/codegen/generic-client-test-codegen/build.gradle.kts index 06ecf446bbae9..eebc1e8a92871 100644 --- a/codegen/generic-client-test-codegen/build.gradle.kts +++ b/codegen/generic-client-test-codegen/build.gradle.kts @@ -47,7 +47,7 @@ tasks["jar"].enabled = false // from smithy-aws-typescript-codegen. tasks["smithyBuildJar"].enabled = false -tasks.create("buildSdk") { +tasks.register("buildSdk") { addRuntimeClasspath = true } diff --git a/codegen/protocol-test-codegen/build.gradle.kts b/codegen/protocol-test-codegen/build.gradle.kts index 8c65e15e61ba3..555f011f859c1 100644 --- a/codegen/protocol-test-codegen/build.gradle.kts +++ b/codegen/protocol-test-codegen/build.gradle.kts @@ -47,7 +47,7 @@ tasks["jar"].enabled = false // from smithy-aws-typescript-codegen. tasks["smithyBuildJar"].enabled = false -tasks.create("buildSdk") { +tasks.register("buildSdk") { addRuntimeClasspath = true } diff --git a/codegen/sdk-codegen/build.gradle.kts b/codegen/sdk-codegen/build.gradle.kts index 8ca85d8790709..6ccb7e52c5db4 100644 --- a/codegen/sdk-codegen/build.gradle.kts +++ b/codegen/sdk-codegen/build.gradle.kts @@ -56,7 +56,7 @@ tasks["jar"].enabled = false // from smithy-aws-typescript-codegen. tasks["smithyBuildJar"].enabled = false -tasks.create("buildSdk") { +tasks.register("buildSdk") { addRuntimeClasspath = true } From 068484f8bf4be846ce04d2e3f34b23b07c8148df Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Thu, 11 Sep 2025 02:30:20 +0000 Subject: [PATCH 3/5] fix(codegen): 'toLowerCase(): String' is deprecated --- codegen/sdk-codegen/build.gradle.kts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codegen/sdk-codegen/build.gradle.kts b/codegen/sdk-codegen/build.gradle.kts index 6ccb7e52c5db4..18878d12fe858 100644 --- a/codegen/sdk-codegen/build.gradle.kts +++ b/codegen/sdk-codegen/build.gradle.kts @@ -96,8 +96,8 @@ tasks.register("generate-smithy-build") { val sdkId = serviceTrait.sdkId .replace(" ", "-") - .toLowerCase(); - val version = service.version.toLowerCase(); + .lowercase(); + val version = service.version.lowercase(); val clientName = sdkId.split("-").toTypedArray() .map { it.capitalize() } @@ -116,7 +116,7 @@ tasks.register("generate-smithy-build") { .withMember("imports", Node.fromStrings("${models.getAbsolutePath()}${File.separator}${file.name}")) .withMember("plugins", Node.objectNode() .withMember("typescript-codegen", Node.objectNodeBuilder() - .withMember("package", "@aws-sdk/client-" + sdkId.toLowerCase()) + .withMember("package", "@aws-sdk/client-" + sdkId.lowercase()) // Note that this version is replaced by Lerna when publishing. .withMember("packageVersion", "3.0.0") .withMember("packageJson", manifestOverwrites) @@ -128,7 +128,7 @@ tasks.register("generate-smithy-build") { useSchemaSerde.contains(serviceTrait.sdkId)) .build())) .build() - projectionsBuilder.withMember(sdkId + "." + version.toLowerCase(), projectionContents) + projectionsBuilder.withMember(sdkId + "." + version.lowercase(), projectionContents) } val buildFile = if (!(clientNameProp?.isEmpty() ?: true)) From 74b046b08027d401403e816bfaf53a6c08e0ebb0 Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Thu, 11 Sep 2025 02:31:57 +0000 Subject: [PATCH 4/5] fix(codegen): 'capitalize(): String' is deprecated. Use replaceFirstChar instead --- codegen/sdk-codegen/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codegen/sdk-codegen/build.gradle.kts b/codegen/sdk-codegen/build.gradle.kts index 18878d12fe858..ae79d1a6ae981 100644 --- a/codegen/sdk-codegen/build.gradle.kts +++ b/codegen/sdk-codegen/build.gradle.kts @@ -100,7 +100,7 @@ tasks.register("generate-smithy-build") { val version = service.version.lowercase(); val clientName = sdkId.split("-").toTypedArray() - .map { it.capitalize() } + .map { it.replaceFirstChar { it.uppercase() } } .joinToString(separator = " ") var manifestOverwrites = Node.parse( File("smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/package.json.template") From 1899056cc7d7065c1c26a7296ca121300182a0ef Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Thu, 11 Sep 2025 02:55:54 +0000 Subject: [PATCH 5/5] fix(codegen): missed fix for buildDir --- codegen/smithy-aws-typescript-codegen/build.gradle.kts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/codegen/smithy-aws-typescript-codegen/build.gradle.kts b/codegen/smithy-aws-typescript-codegen/build.gradle.kts index e743b6242871b..ffa9c6e09c57d 100644 --- a/codegen/smithy-aws-typescript-codegen/build.gradle.kts +++ b/codegen/smithy-aws-typescript-codegen/build.gradle.kts @@ -79,7 +79,10 @@ tasks.register("set-aws-sdk-versions") { sourceSets { main { resources { - setSrcDirs(listOf("src/main/resources", "$buildDir/generated/resources")) + setSrcDirs(listOf( + "src/main/resources", + layout.buildDirectory.dir("generated/resources").get().asFile + )) } } }