Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 7 additions & 3 deletions codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ subprojects {
repositories {
maven {
name = "stagingRepository"
url = uri("${rootProject.buildDir}/staging")
url = rootProject.layout.buildDirectory.dir("staging").get().asFile.toURI()
}
}

Expand Down Expand Up @@ -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
)
}
}

Expand Down Expand Up @@ -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
)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion codegen/generic-client-test-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ tasks["jar"].enabled = false
// from smithy-aws-typescript-codegen.
tasks["smithyBuildJar"].enabled = false

tasks.create<SmithyBuild>("buildSdk") {
tasks.register<SmithyBuild>("buildSdk") {
addRuntimeClasspath = true
}

Expand Down
2 changes: 1 addition & 1 deletion codegen/protocol-test-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ tasks["jar"].enabled = false
// from smithy-aws-typescript-codegen.
tasks["smithyBuildJar"].enabled = false

tasks.create<SmithyBuild>("buildSdk") {
tasks.register<SmithyBuild>("buildSdk") {
addRuntimeClasspath = true
}

Expand Down
12 changes: 6 additions & 6 deletions codegen/sdk-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ tasks["jar"].enabled = false
// from smithy-aws-typescript-codegen.
tasks["smithyBuildJar"].enabled = false

tasks.create<SmithyBuild>("buildSdk") {
tasks.register<SmithyBuild>("buildSdk") {
addRuntimeClasspath = true
}

Expand Down Expand Up @@ -96,11 +96,11 @@ 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() }
.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")
Expand All @@ -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)
Expand All @@ -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))
Expand Down
13 changes: 9 additions & 4 deletions codegen/smithy-aws-typescript-codegen/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -77,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
))
}
}
}
Expand Down
Loading