From fb5e235446aa357c95e4ad1c0fc32537aed18cad Mon Sep 17 00:00:00 2001 From: david-perez Date: Wed, 11 May 2022 19:51:14 +0200 Subject: [PATCH] Register Gradle tasks instead of eagerly creating them (#1374) Using `.register()` avoids creating possibly unnecessary tasks. --- aws/sdk/build.gradle.kts | 14 +++++++------- build.gradle.kts | 2 +- codegen-server-test/build.gradle.kts | 4 ++-- codegen-test/build.gradle.kts | 4 ++-- rust-runtime/build.gradle.kts | 2 +- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/aws/sdk/build.gradle.kts b/aws/sdk/build.gradle.kts index c96c87b0c..ed5883589 100644 --- a/aws/sdk/build.gradle.kts +++ b/aws/sdk/build.gradle.kts @@ -126,7 +126,7 @@ fun generateSmithyBuild(services: AwsServices): String { """ } -task("generateSmithyBuild") { +tasks.register("generateSmithyBuild") { description = "generate smithy-build.json" inputs.property("servicelist", awsServices.services.toString()) inputs.property("eventStreamAllowList", eventStreamAllowList) @@ -138,7 +138,7 @@ task("generateSmithyBuild") { } } -task("generateIndexMd") { +tasks.register("generateIndexMd") { inputs.property("servicelist", awsServices.services.toString()) val indexMd = outputDir.resolve("index.md") outputs.file(indexMd) @@ -147,7 +147,7 @@ task("generateIndexMd") { } } -task("relocateServices") { +tasks.register("relocateServices") { description = "relocate AWS services to their final destination" doLast { awsServices.services.forEach { @@ -172,7 +172,7 @@ task("relocateServices") { outputs.dir(sdkOutputDir) } -task("relocateExamples") { +tasks.register("relocateExamples") { description = "relocate the examples folder & rewrite path dependencies" doLast { if (awsServices.examples.isNotEmpty()) { @@ -193,7 +193,7 @@ task("relocateExamples") { outputs.dir(outputDir) } -task("fixExampleManifests") { +tasks.register("fixExampleManifests") { description = "Adds dependency path and corrects version number of examples after relocation" enabled = awsServices.examples.isNotEmpty() @@ -272,7 +272,7 @@ fun generateCargoWorkspace(services: AwsServices): String { """.trimMargin() } -task("generateCargoWorkspace") { +tasks.register("generateCargoWorkspace") { description = "generate Cargo.toml workspace file" doFirst { outputDir.mkdirs() @@ -346,7 +346,7 @@ tasks.register("generateVersionManifest") { ) } -task("finalizeSdk") { +tasks.register("finalizeSdk") { dependsOn("assemble") outputs.upToDateWhen { false } finalizedBy( diff --git a/build.gradle.kts b/build.gradle.kts index c905c6cb6..5887024d2 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -62,7 +62,7 @@ tasks.register("ktlintFormat") { } @Suppress("UnstableApiUsage") -task("jacocoMerge") { +tasks.register("jacocoMerge") { group = LifecycleBasePlugin.VERIFICATION_GROUP description = "Merge the JaCoCo data files from all subprojects into one" afterEvaluate { diff --git a/codegen-server-test/build.gradle.kts b/codegen-server-test/build.gradle.kts index 4dee1b465..ce9ca7401 100644 --- a/codegen-server-test/build.gradle.kts +++ b/codegen-server-test/build.gradle.kts @@ -44,7 +44,7 @@ val allCodegenTests = listOf( CodegenTest("com.aws.example#PokemonService", "pokemon_service_sdk") ) -task("generateSmithyBuild") { +tasks.register("generateSmithyBuild") { description = "generate smithy-build.json" doFirst { projectDir.resolve("smithy-build.json") @@ -58,7 +58,7 @@ task("generateSmithyBuild") { } } -task("generateCargoWorkspace") { +tasks.register("generateCargoWorkspace") { description = "generate Cargo.toml workspace file" doFirst { buildDir.resolve("$workingDirUnderBuildDir/Cargo.toml") diff --git a/codegen-test/build.gradle.kts b/codegen-test/build.gradle.kts index 039750b9f..e9755f950 100644 --- a/codegen-test/build.gradle.kts +++ b/codegen-test/build.gradle.kts @@ -88,7 +88,7 @@ val allCodegenTests = listOf( CodegenTest("com.aws.example#PokemonService", "pokemon_service_client") ) -task("generateSmithyBuild") { +tasks.register("generateSmithyBuild") { description = "generate smithy-build.json" doFirst { projectDir.resolve("smithy-build.json") @@ -102,7 +102,7 @@ task("generateSmithyBuild") { } } -task("generateCargoWorkspace") { +tasks.register("generateCargoWorkspace") { description = "generate Cargo.toml workspace file" doFirst { buildDir.resolve("$workingDirUnderBuildDir/Cargo.toml") diff --git a/rust-runtime/build.gradle.kts b/rust-runtime/build.gradle.kts index a7c3bf2d4..6910f46b0 100644 --- a/rust-runtime/build.gradle.kts +++ b/rust-runtime/build.gradle.kts @@ -39,7 +39,7 @@ tasks.register("copyRuntimeCrates") { into(runtimeOutputDir) } -task("fixRuntimeCrateVersions") { +tasks.register("fixRuntimeCrateVersions") { dependsOn("copyRuntimeCrates") doLast { CrateSet.ENTIRE_SMITHY_RUNTIME.forEach { moduleName -> -- GitLab