diff --git a/.test-infra/jenkins/job_PreCommit_Whitespace.groovy b/.test-infra/jenkins/job_PreCommit_Whitespace.groovy index 1b8341395a684695ca99c38d42930c07c5ec7edb..0221cf72917d66d0e2042321e22b94cdc78d56fb 100644 --- a/.test-infra/jenkins/job_PreCommit_Whitespace.groovy +++ b/.test-infra/jenkins/job_PreCommit_Whitespace.groovy @@ -25,6 +25,7 @@ PrecommitJobBuilder builder = new PrecommitJobBuilder( triggerPathPatterns: [ '.*\\.md$', '.*build\\.gradle$', + '.*build\\.gradle.kts$', ] ) builder.build() diff --git a/build.gradle.kts b/build.gradle.kts index 57438fa6768779813f49e7f69d0f67fce3503e7a..2ffbc765a798b734a1834d6ee026519504132e11 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -578,7 +578,7 @@ tasks.register("pushAllRunnersDockerImages") { for (version in project.ext.get("allFlinkVersions") as Array<*>) { dependsOn(":runners:flink:${version}:job-server-container:dockerPush") } - + doLast { if (project.hasProperty("prune-images")) { exec { @@ -598,7 +598,7 @@ tasks.register("pushAllSdkDockerImages") { dependsOn(":sdks:python:container:pushAll") dependsOn(":sdks:go:container:pushAll") dependsOn(":sdks:typescript:container:pushAll") - + doLast { if (project.hasProperty("prune-images")) { exec { @@ -617,7 +617,7 @@ tasks.register("pushAllXlangDockerImages") { dependsOn(":sdks:java:expansion-service:container:dockerPush") dependsOn(":sdks:java:transform-service:controller-container:dockerPush") dependsOn(":sdks:python:expansion-service-container:dockerPush") - + doLast { if (project.hasProperty("prune-images")) { exec { diff --git a/learning/tour-of-beam/terraform/build.gradle.kts b/learning/tour-of-beam/terraform/build.gradle.kts index 8c320dd242a7c13010f457924f87bfdc7e523aa0..30d30309273ca396b6eb50fe99461967302882dd 100644 --- a/learning/tour-of-beam/terraform/build.gradle.kts +++ b/learning/tour-of-beam/terraform/build.gradle.kts @@ -49,7 +49,7 @@ tasks.register<TerraformTask>("terraformRef") { tasks.register<TerraformTask>("terraformApplyBackend") { group = "backend-deploy" - + val pg_router_host = if (project.extensions.extraProperties.has("pg_router_host")) { project.extensions.extraProperties["pg_router_host"] as String } else { @@ -64,7 +64,7 @@ tasks.register<TerraformTask>("terraformApplyBackend") { "-var=project_id=$(gcloud config get-value project)", "-var-file=./common.tfvars" ) - + tasks.getByName("uploadLearningMaterials").mustRunAfter(this) } @@ -174,7 +174,7 @@ tasks.register("firebaseHostingCreate") { }.assertNormalExitValue() println("Firebase hosting site has been added to project $projectId.") } - + exec { executable("firebase") args("target:apply", "hosting", webapp_id , webapp_id) @@ -184,12 +184,12 @@ tasks.register("firebaseHostingCreate") { val file = project.file("../frontend/firebase.json") val content = file.readText() - + val oldContent = """"public": "build/web",""" val newContent = """"public": "build/web", "target": "$webapp_id",""" val updatedContent = content.replace(oldContent, newContent) - + file.writeText(updatedContent) } } diff --git a/sdks/python/test-suites/tox/py38/build.gradle b/sdks/python/test-suites/tox/py38/build.gradle index 5b5b48298bd3bdf8f4b085829aaaafbf6cd9811d..7243a0188eda7df2b3c855c7822054465c9d5287 100644 --- a/sdks/python/test-suites/tox/py38/build.gradle +++ b/sdks/python/test-suites/tox/py38/build.gradle @@ -139,7 +139,9 @@ task archiveFilesToLint(type: Zip) { from ("$rootProject.projectDir") { include "**/*.md" include "**/build.gradle" + include '**/build.gradle.kts' exclude "**/node_modules/*" + exclude "**/.gogradle/*" } }