From e8e604d1c51b2201fe563479324ce2ba231ac062 Mon Sep 17 00:00:00 2001
From: Yi Hu <yathu@google.com>
Date: Mon, 10 Jul 2023 15:34:06 -0400
Subject: [PATCH] Add build.gradle.kts to whitespace check (#27431)
* Add build.gradle.kts to whitespace check
* test - add some whitespace
* Revert "test - add some whitespace"
This reverts commit 13319f9b3686c3ce1d5d619ea19bfe5f4efabd64.
* Fix more whitespace
---
.test-infra/jenkins/job_PreCommit_Whitespace.groovy | 1 +
build.gradle.kts | 6 +++---
learning/tour-of-beam/terraform/build.gradle.kts | 10 +++++-----
sdks/python/test-suites/tox/py38/build.gradle | 2 ++
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/.test-infra/jenkins/job_PreCommit_Whitespace.groovy b/.test-infra/jenkins/job_PreCommit_Whitespace.groovy
index 1b8341395a6..0221cf72917 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 57438fa6768..2ffbc765a79 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 8c320dd242a..30d30309273 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 5b5b48298bd..7243a0188ed 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/*"
}
}
--
GitLab