From 38e8af579f94e0dd00967e87138d533ee805e8ee Mon Sep 17 00:00:00 2001 From: Ian Smith Botsford Date: Wed, 30 Nov 2022 19:37:49 +0000 Subject: [PATCH] chore: improve build properties for service clients --- codegen/sdk/build.gradle.kts | 3 ++- .../main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt | 3 +++ gradle/publish.gradle | 6 ++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/codegen/sdk/build.gradle.kts b/codegen/sdk/build.gradle.kts index c380c8ff996..b6490f14d36 100644 --- a/codegen/sdk/build.gradle.kts +++ b/codegen/sdk/build.gradle.kts @@ -184,6 +184,7 @@ fun fileToService(applyFilters: Boolean): (File) -> AwsService? = { file: File - .replace("-", "") .toLowerCase() .kotlinNamespace() + val packageDescription = "The AWS Kotlin client for $sdkId" when { applyFilters && !serviceMembership.isMember(filename, packageName) -> { @@ -211,7 +212,7 @@ fun fileToService(applyFilters: Boolean): (File) -> AwsService? = { file: File - projectionName = filename, sdkId = sdkId, version = service.version, - description = description, + description = packageDescription, ) } } diff --git a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt index 0c355b87fbe..3a478c7d17f 100644 --- a/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt +++ b/codegen/smithy-aws-kotlin-codegen/src/main/kotlin/aws/sdk/kotlin/codegen/GradleGenerator.kt @@ -42,6 +42,9 @@ class GradleGenerator : KotlinIntegration { writer.write("description = #S", ctx.settings.pkg.description) } + writer.write("project.ext.set(#S, #S)", "aws.sdk.id", ctx.settings.sdkId) + writer.write("") + writer.write("val kotlinVersion: String by project") val allDependencies = delegator.dependencies.mapNotNull { it.properties["dependency"] as? KotlinDependency }.distinct() diff --git a/gradle/publish.gradle b/gradle/publish.gradle index 0102089d00a..503165c55a4 100644 --- a/gradle/publish.gradle +++ b/gradle/publish.gradle @@ -50,6 +50,12 @@ publishing { url = "https://github.com/awslabs/aws-sdk-kotlin" } + if (project.hasProperty("aws.sdk.id")) { + properties = [ + "aws.sdk.id": (String) project.property("aws.sdk.id") + ] + } + artifact(tasks["javadocJar"]) } }