From 200f7e8f414e5e2754a4d3e4f86cac4d9963deec Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:40:24 +0000 Subject: [PATCH 1/2] fix(codegen): 'getter for buildDir: File!' is deprecated --- build.gradle.kts | 10 +++++++--- smithy-typescript-codegen/build.gradle.kts | 13 +++++++++---- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dc2e7bf486b..6d626b1a247 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -123,7 +123,7 @@ subprojects { repositories { maven { name = "stagingRepository" - url = uri("${rootProject.buildDir}/staging") + url = rootProject.layout.buildDirectory.dir("staging").get().asFile.toURI() } } @@ -221,7 +221,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 + ) } } @@ -283,7 +285,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/smithy-typescript-codegen/build.gradle.kts b/smithy-typescript-codegen/build.gradle.kts index c4da63eb2e0..970f9e5cc29 100644 --- a/smithy-typescript-codegen/build.gradle.kts +++ b/smithy-typescript-codegen/build.gradle.kts @@ -48,16 +48,21 @@ dependencies { sourceSets { main { resources { - setSrcDirs(listOf("src/main/resources", "$buildDir/generated/resources")) + setSrcDirs(listOf( + "src/main/resources", + layout.buildDirectory.dir("generated/resources").get().asFile + )) } } } tasks.register("set-dependency-versions") { doLast { - mkdir("$buildDir/generated/resources/software/amazon/smithy/typescript/codegen") - val versionsFile = - file("$buildDir/generated/resources/software/amazon/smithy/typescript/codegen/dependencyVersions.properties") + mkdir(layout.buildDirectory.dir("generated/resources/software/amazon/smithy/typescript/codegen").get().asFile) + var versionsFile = layout.buildDirectory + .file("generated/resources/software/amazon/smithy/typescript/codegen/dependencyVersions.properties") + .get() + .asFile versionsFile.printWriter().close() val roots = project.file("../packages").listFiles().toMutableList() + project.file("../smithy-typescript-ssdk-libs").listFiles().toList() From 13eed9b2bcd207cd8cca58bcf5e1a58946a323ac Mon Sep 17 00:00:00 2001 From: Trivikram Kamat <16024985+trivikr@users.noreply.github.com> Date: Thu, 11 Sep 2025 14:46:28 +0000 Subject: [PATCH 2/2] fix(codegen): 'create(String, noinline T.() -> Unit): T' is deprecated --- smithy-typescript-protocol-test-codegen/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/smithy-typescript-protocol-test-codegen/build.gradle.kts b/smithy-typescript-protocol-test-codegen/build.gradle.kts index 31005e01a22..f028dc74770 100644 --- a/smithy-typescript-protocol-test-codegen/build.gradle.kts +++ b/smithy-typescript-protocol-test-codegen/build.gradle.kts @@ -28,7 +28,7 @@ tasks["jar"].enabled = false tasks["smithyBuildJar"].enabled = false -tasks.create("buildSdk") { +tasks.register("buildSdk") { addRuntimeClasspath = true }