Extract common code to a function

bufbuild · Jul 25, 2024 · c26a521 · c26a521
1 parent a7a0625
commit c26a521
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 42 deletions.
diff --git a/src/main/kotlin/build/buf/gradle/BufSupport.kt b/src/main/kotlin/build/buf/gradle/BufSupport.kt
@@ -94,3 +94,10 @@ internal fun AbstractBufExecTask.execBuf(
         }
     }
 }
+
+internal fun AbstractBufExecTask.obtainDefaultProtoFileSet() =
+    project.fileTree(workingDir.get()) {
+        include("**/*.proto")
+        // not to interfere with random plugins producing output to build dir
+        exclude("build")
+    }
diff --git a/src/main/kotlin/build/buf/gradle/BuildConfiguration.kt b/src/main/kotlin/build/buf/gradle/BuildConfiguration.kt
@@ -35,13 +35,7 @@ internal fun Project.configureBuild() {
             dependsOn(COPY_BUF_CONFIG_TASK_NAME)
         }
 
-        inputFiles.setFrom(
-            fileTree(workingDir.get()) {
-                include("**/*.proto")
-                // not to interfere with random plugins producing output to build dir
-                exclude("build")
-            },
-        )
+        inputFiles.setFrom(obtainDefaultProtoFileSet())
         publicationFile.set(project.bufBuildPublicationFile)
     }
 }

diff --git a/src/main/kotlin/build/buf/gradle/FormatConfiguration.kt b/src/main/kotlin/build/buf/gradle/FormatConfiguration.kt
@@ -32,13 +32,7 @@ private fun Project.configureBufFormatCheck() {
         description = "Checks that a Protobuf schema is formatted according to Buf's formatting rules."
         enabled = getExtension().enforceFormat
 
-        inputFiles.setFrom(
-            fileTree(workingDir.get()) {
-                include("**/*.proto")
-                // not to interfere with random plugins producing output to build dir
-                exclude("build")
-            },
-        )
+        inputFiles.setFrom(obtainDefaultProtoFileSet())
     }
 
     tasks.named(CHECK_TASK_NAME).dependsOn(BUF_FORMAT_CHECK_TASK_NAME)
@@ -49,19 +43,7 @@ private fun Project.configureBufFormatApply() {
         group = VERIFICATION_GROUP
         description = "Formats a Protobuf schema according to Buf's formatting rules."
 
-        inputFiles.setFrom(
-            fileTree(workingDir.get()) {
-                include("**/*.proto")
-                // not to interfere with random plugins producing output to build dir
-                exclude("build")
-            },
-        )
-        outputFiles.setFrom(
-            fileTree(workingDir.get()) {
-                include("**/*.proto")
-                // not to interfere with random plugins producing output to build dir
-                exclude("build")
-            },
-        )
+        inputFiles.setFrom(obtainDefaultProtoFileSet())
+        outputFiles.setFrom(obtainDefaultProtoFileSet())
     }
 }
diff --git a/src/main/kotlin/build/buf/gradle/GenerateConfiguration.kt b/src/main/kotlin/build/buf/gradle/GenerateConfiguration.kt
@@ -30,13 +30,7 @@ internal fun Project.configureGenerate() {
         val generateOptions = project.getExtension().generateOptions
         includeImports.set(generateOptions?.includeImports ?: false)
         templateFile.set(generateOptions?.let { resolveTemplateFile(it) })
-        inputFiles.setFrom(
-            fileTree(workingDir.get()) {
-                include("**/*.proto")
-                // not to interfere with random plugins producing output to build dir
-                exclude("build")
-            },
-        )
+        inputFiles.setFrom(obtainDefaultProtoFileSet())
         outputDirectory.set(File(project.bufbuildDir, GENERATED_DIR))
     }
 }

diff --git a/src/main/kotlin/build/buf/gradle/LintConfiguration.kt b/src/main/kotlin/build/buf/gradle/LintConfiguration.kt
@@ -26,13 +26,7 @@ internal fun Project.configureLint() {
         description = "Checks that a Protobuf schema conforms to the Buf lint configuration."
 
         bufConfigFile.set(project.bufConfigFile())
-        inputFiles.setFrom(
-            fileTree(workingDir.get()) {
-                include("**/*.proto")
-                // not to interfere with random plugins producing output to build dir
-                exclude("build")
-            },
-        )
+        inputFiles.setFrom(obtainDefaultProtoFileSet())
     }
 
     tasks.named(CHECK_TASK_NAME).dependsOn(BUF_LINT_TASK_NAME)