Skip to content

Commit 127022c

Browse files
authored
fix(codegen): update deprecated APIs in build.gradle.kts (#7335)
1 parent 3680746 commit 127022c

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

codegen/build.gradle.kts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ subprojects {
125125
repositories {
126126
maven {
127127
name = "stagingRepository"
128-
url = uri("${rootProject.buildDir}/staging")
128+
url = rootProject.layout.buildDirectory.dir("staging").get().asFile.toURI()
129129
}
130130
}
131131

@@ -217,7 +217,9 @@ subprojects {
217217
reports {
218218
xml.required.set(false)
219219
csv.required.set(false)
220-
html.outputLocation.set(file("$buildDir/reports/jacoco"))
220+
html.outputLocation.set(
221+
layout.buildDirectory.dir("reports/jacoco").get().asFile
222+
)
221223
}
222224
}
223225

@@ -288,7 +290,9 @@ jreleaser {
288290
create("maven-central") {
289291
active = Active.ALWAYS
290292
url = "https://central.sonatype.com/api/v1/publisher"
291-
stagingRepositories.add("${rootProject.buildDir}/staging")
293+
stagingRepositories.add(
294+
rootProject.layout.buildDirectory.dir("staging").get().asFile.absolutePath
295+
)
292296
}
293297
}
294298
}

codegen/generic-client-test-codegen/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ tasks["jar"].enabled = false
4747
// from smithy-aws-typescript-codegen.
4848
tasks["smithyBuildJar"].enabled = false
4949

50-
tasks.create<SmithyBuild>("buildSdk") {
50+
tasks.register<SmithyBuild>("buildSdk") {
5151
addRuntimeClasspath = true
5252
}
5353

codegen/protocol-test-codegen/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ tasks["jar"].enabled = false
4747
// from smithy-aws-typescript-codegen.
4848
tasks["smithyBuildJar"].enabled = false
4949

50-
tasks.create<SmithyBuild>("buildSdk") {
50+
tasks.register<SmithyBuild>("buildSdk") {
5151
addRuntimeClasspath = true
5252
}
5353

codegen/sdk-codegen/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ tasks["jar"].enabled = false
5656
// from smithy-aws-typescript-codegen.
5757
tasks["smithyBuildJar"].enabled = false
5858

59-
tasks.create<SmithyBuild>("buildSdk") {
59+
tasks.register<SmithyBuild>("buildSdk") {
6060
addRuntimeClasspath = true
6161
}
6262

@@ -96,11 +96,11 @@ tasks.register("generate-smithy-build") {
9696

9797
val sdkId = serviceTrait.sdkId
9898
.replace(" ", "-")
99-
.toLowerCase();
100-
val version = service.version.toLowerCase();
99+
.lowercase();
100+
val version = service.version.lowercase();
101101

102102
val clientName = sdkId.split("-").toTypedArray()
103-
.map { it.capitalize() }
103+
.map { it.replaceFirstChar { it.uppercase() } }
104104
.joinToString(separator = " ")
105105
var manifestOverwrites = Node.parse(
106106
File("smithy-aws-typescript-codegen/src/main/resources/software/amazon/smithy/aws/typescript/codegen/package.json.template")
@@ -116,7 +116,7 @@ tasks.register("generate-smithy-build") {
116116
.withMember("imports", Node.fromStrings("${models.getAbsolutePath()}${File.separator}${file.name}"))
117117
.withMember("plugins", Node.objectNode()
118118
.withMember("typescript-codegen", Node.objectNodeBuilder()
119-
.withMember("package", "@aws-sdk/client-" + sdkId.toLowerCase())
119+
.withMember("package", "@aws-sdk/client-" + sdkId.lowercase())
120120
// Note that this version is replaced by Lerna when publishing.
121121
.withMember("packageVersion", "3.0.0")
122122
.withMember("packageJson", manifestOverwrites)
@@ -128,7 +128,7 @@ tasks.register("generate-smithy-build") {
128128
useSchemaSerde.contains(serviceTrait.sdkId))
129129
.build()))
130130
.build()
131-
projectionsBuilder.withMember(sdkId + "." + version.toLowerCase(), projectionContents)
131+
projectionsBuilder.withMember(sdkId + "." + version.lowercase(), projectionContents)
132132
}
133133

134134
val buildFile = if (!(clientNameProp?.isEmpty() ?: true))

codegen/smithy-aws-typescript-codegen/build.gradle.kts

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,11 @@ dependencies {
5353

5454
tasks.register("set-aws-sdk-versions") {
5555
doLast {
56-
mkdir("$buildDir/generated/resources/software/amazon/smithy/aws/typescript/codegen")
57-
var versionsFile =
58-
file("$buildDir/generated/resources/software/amazon/smithy/aws/typescript/codegen/sdkVersions.properties")
56+
mkdir(layout.buildDirectory.dir("generated/resources/software/amazon/smithy/aws/typescript/codegen").get().asFile)
57+
var versionsFile = layout.buildDirectory
58+
.file("generated/resources/software/amazon/smithy/aws/typescript/codegen/sdkVersions.properties")
59+
.get()
60+
.asFile
5961
versionsFile.printWriter().close()
6062

6163
var roots = project.file("../../packages").listFiles().toMutableList() + project.file("../../clients").listFiles().toList()
@@ -77,7 +79,10 @@ tasks.register("set-aws-sdk-versions") {
7779
sourceSets {
7880
main {
7981
resources {
80-
setSrcDirs(listOf("src/main/resources", "$buildDir/generated/resources"))
82+
setSrcDirs(listOf(
83+
"src/main/resources",
84+
layout.buildDirectory.dir("generated/resources").get().asFile
85+
))
8186
}
8287
}
8388
}

0 commit comments

Comments
 (0)