Support configuration cache

src/main/kotlin/build/buf/gradle/AbstractBufExecTask.kt

@@ -0,0 +1,50 @@
+// Copyright 2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package build.buf.gradle
+
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFiles
+import java.io.File
+
+/**
+ * A task executing buf executable as part of its operation.
+ */
+abstract class AbstractBufExecTask : AbstractBufTask() {
+    /** The buf executable. */
+    @get:InputFiles
+    internal abstract val bufExecutable: ConfigurableFileCollection
+
+    /**
+     * The directory in which buf is executed.
+     * The actual real input files in this directory have to be tracked per command separately,
+     * so it is just an @Input, not @InputDirectory.
+     */
+    @get:Input
+    internal abstract val workingDir: Property<File>
+
+    /** Whether the project has protobuf plugin enabled. */
+    @get:Input
+    internal abstract val hasProtobufGradlePlugin: Property<Boolean>
+
+    /** Directories possibly containing input .proto files. */
+    @get:InputFiles
+    internal abstract val candidateProtoDirs: ConfigurableFileCollection
+
+    /** Whether the project has buf workspace or not. */
+    @get:Input
+    internal abstract val hasWorkspace: Property<Boolean>
+}

src/main/kotlin/build/buf/gradle/AbstractBufTask.kt

@@ -0,0 +1,29 @@
+// Copyright 2024 Buf Technologies, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package build.buf.gradle
+
+import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import java.io.File
+
+abstract class AbstractBufTask : DefaultTask() {
+    /**
+     * This property has to be set to project directory. It is only used for relativization of paths,
+     * so it is just an @Input, not @InputDirectory.
+     */
+    @get:Input
+    internal abstract val projectDir: Property<File>
+}

src/main/kotlin/build/buf/gradle/BreakingConfiguration.kt

@@ -50,10 +50,18 @@ private fun Project.addSchemaDependency(artifactDetails: ArtifactDetails) {
 }
 
 private fun Project.configureBreakingTask() {
-    registerBufTask<BreakingTask>(BUF_BREAKING_TASK_NAME) {
+    registerBufExecTask<BreakingTask>(BUF_BREAKING_TASK_NAME) {
         group = VERIFICATION_GROUP
         description = "Checks that Protobuf API definitions are backwards-compatible with previous versions."
 
         dependsOn(BUF_BUILD_TASK_NAME)
+
+        if (project.bufV1SyntaxOnly()) {
+            v1SyntaxOnly.set(true)
+            publicationFile.set(project.bufBuildPublicationFile)
+        } else {
+            v1SyntaxOnly.set(false)
+        }
+        configFile.set(singleFileFromConfiguration(BUF_BREAKING_CONFIGURATION_NAME))
     }
 }

src/main/kotlin/build/buf/gradle/BreakingTask.kt

@@ -14,19 +14,35 @@
 
 package build.buf.gradle
 
-import org.gradle.api.DefaultTask
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.Input
+import org.gradle.api.tasks.InputFile
+import org.gradle.api.tasks.Optional
 import org.gradle.api.tasks.TaskAction
+import java.io.File
+
+abstract class BreakingTask : AbstractBufExecTask() {
+    @get:Input
+    internal abstract val v1SyntaxOnly: Property<Boolean>
+
+    /** The input publication file. */
+    @get:InputFile
+    @get:Optional
+    internal abstract val publicationFile: Property<File>
+
+    /** The input breaking config file. */
+    @get:InputFile
+    internal abstract val configFile: Property<File>
 
-abstract class BreakingTask : DefaultTask() {
     @TaskAction
     fun bufBreaking() {
         val args = mutableListOf<Any>()
         args.add("breaking")
-        if (project.bufV1SyntaxOnly()) {
-            args.add(bufBuildPublicationFile)
+        if (v1SyntaxOnly.get()) {
+            args.add(publicationFile.get())
         }
         args.add("--against")
-        args.add(singleFileFromConfiguration(BUF_BREAKING_CONFIGURATION_NAME))
+        args.add(configFile.get())
         execBuf(*args.toTypedArray()) {
             """
                 |Some Protobuf files had breaking changes:

src/main/kotlin/build/buf/gradle/BufPlugin.kt

@@ -35,6 +35,7 @@ class BufPlugin : Plugin<Project> {
     }
 
     private fun Project.configureBuf() {
+        createBufBinaryDependencyConfiguration()
         configureLint()
         configureFormat()
         configureBuild()

src/main/kotlin/build/buf/gradle/BufSupport.kt

@@ -15,11 +15,15 @@
 package build.buf.gradle
 
 import org.gradle.api.Project
-import org.gradle.api.Task
+import org.gradle.kotlin.dsl.dependencies
 import java.nio.charset.StandardCharsets
 
 const val BUF_BINARY_CONFIGURATION_NAME = "bufTool"
 
+internal fun Project.createBufBinaryDependencyConfiguration() {
+    configurations.create(BUF_BINARY_CONFIGURATION_NAME)
+}
+
 internal fun Project.configureBufDependency() {
     val os = System.getProperty("os.name").lowercase()
     val osPart =
@@ -39,60 +43,61 @@ internal fun Project.configureBufDependency() {
 
     val extension = getExtension()
 
-    createConfigurationWithDependency(
-        BUF_BINARY_CONFIGURATION_NAME,
-        mapOf(
-            "group" to "build.buf",
-            "name" to "buf",
-            "version" to extension.toolVersion,
-            "classifier" to "$osPart-$archPart",
-            "ext" to "exe",
-        ),
-    )
+    dependencies {
+        add(
+            BUF_BINARY_CONFIGURATION_NAME,
+            mapOf(
+                "group" to "build.buf",
+                "name" to "buf",
+                "version" to extension.toolVersion,
+                "classifier" to "$osPart-$archPart",
+                "ext" to "exe",
+            ),
+        )
+    }
 }
 
-internal fun Task.execBuf(
+internal fun AbstractBufExecTask.execBuf(
     vararg args: Any,
     customErrorMessage: ((String) -> String)? = null,
 ) {
     execBuf(args.asList(), customErrorMessage)
 }
 
-internal fun Task.execBuf(
+internal fun AbstractBufExecTask.execBuf(
     args: Iterable<Any>,
     customErrorMessage: ((String) -> String)? = null,
 ) {
-    with(project) {
-        val executable = singleFileFromConfiguration(BUF_BINARY_CONFIGURATION_NAME)
-
-        if (!executable.canExecute()) {
-            executable.setExecutable(true)
-        }
+    val executable = bufExecutable.singleFile
 
-        val workingDir =
-            if (hasProtobufGradlePlugin()) {
-                bufbuildDir
-            } else {
-                projectDir
-            }
+    if (!executable.canExecute()) {
+        executable.setExecutable(true)
+    }
 
-        val processArgs = listOf(executable.absolutePath) + args
+    val processArgs = listOf(executable.absolutePath) + args
+    val workingDirValue = workingDir.get()
 
-        logger.info("Running buf from $workingDir: `buf ${args.joinToString(" ")}`")
-        val result = ProcessRunner().use { it.shell(workingDir, processArgs) }
+    logger.info("Running buf from $workingDirValue: `buf ${args.joinToString(" ")}`")
+    val result = ProcessRunner().use { it.shell(workingDirValue, processArgs) }
 
-        if (result.exitCode != 0) {
-            if (customErrorMessage != null) {
-                val stdOut = result.stdOut.toString(StandardCharsets.UTF_8)
-                val stdErr = result.stdErr.toString(StandardCharsets.UTF_8)
-                val ex = IllegalStateException(customErrorMessage(stdOut))
-                if (stdErr.isNotEmpty()) {
-                    ex.addSuppressed(IllegalStateException(result.toString()))
-                }
-                throw ex
-            } else {
-                error(result.toString())
+    if (result.exitCode != 0) {
+        if (customErrorMessage != null) {
+            val stdOut = result.stdOut.toString(StandardCharsets.UTF_8)
+            val stdErr = result.stdErr.toString(StandardCharsets.UTF_8)
+            val ex = IllegalStateException(customErrorMessage(stdOut))
+            if (stdErr.isNotEmpty()) {
+                ex.addSuppressed(IllegalStateException(result.toString()))
             }
+            throw ex
+        } else {
+            error(result.toString())
         }
     }
 }
+
+internal fun AbstractBufExecTask.obtainDefaultProtoFileSet() =
+    project.fileTree(workingDir.get()) {
+        include("**/*.proto")
+        // not to interfere with random plugins producing output to build dir
+        exclude("build")
+    }

src/main/kotlin/build/buf/gradle/BuildConfiguration.kt

@@ -15,7 +15,6 @@
 package build.buf.gradle
 
 import org.gradle.api.Project
-import org.gradle.api.Task
 import org.gradle.api.publish.PublishingExtension
 import org.gradle.api.publish.maven.MavenPublication
 import org.gradle.kotlin.dsl.create
@@ -28,16 +27,16 @@ private const val BUF_BUILD_PUBLICATION_FILE_BASE_NAME = "image"
 const val BUF_IMAGE_PUBLICATION_NAME = "bufImagePublication"
 
 internal fun Project.configureBuild() {
-    registerBufTask<BuildTask>(BUF_BUILD_TASK_NAME) {
+    registerBufExecTask<BuildTask>(BUF_BUILD_TASK_NAME) {
         group = BUILD_GROUP
         description = "Builds a Buf image from a Protobuf schema."
 
         if (hasProtobufGradlePlugin()) {
             dependsOn(COPY_BUF_CONFIG_TASK_NAME)
-        } else {
-            // Called already during workspace configuration if the protobuf-gradle-plugin has been applied
-            createsOutput()
         }
+
+        inputFiles.setFrom(obtainDefaultProtoFileSet())
+        publicationFile.set(project.bufBuildPublicationFile)
     }
 }
 
@@ -64,8 +63,5 @@ private val Project.bufBuildPublicationFileExtension
             deets.imageFormat.formatName + deets.compressionFormat?.let { ".${it.ext}" }.orEmpty()
         }
 
-private val Project.bufBuildPublicationFile
+internal val Project.bufBuildPublicationFile
     get() = File(bufbuildDir, "$BUF_BUILD_PUBLICATION_FILE_BASE_NAME.$bufBuildPublicationFileExtension")
-
-internal val Task.bufBuildPublicationFile
-    get() = project.bufBuildPublicationFile

src/main/kotlin/build/buf/gradle/BuildTask.kt

@@ -14,12 +14,24 @@
 
 package build.buf.gradle
 
-import org.gradle.api.DefaultTask
+import org.gradle.api.file.ConfigurableFileCollection
+import org.gradle.api.provider.Property
+import org.gradle.api.tasks.InputFiles
+import org.gradle.api.tasks.OutputFile
 import org.gradle.api.tasks.TaskAction
+import java.io.File
+
+abstract class BuildTask : AbstractBufExecTask() {
+    /** The input files. */
+    @get:InputFiles
+    internal abstract val inputFiles: ConfigurableFileCollection
+
+    /** The output publication file. */
+    @get:OutputFile
+    internal abstract val publicationFile: Property<File>
 
-abstract class BuildTask : DefaultTask() {
     @TaskAction
     fun bufBuild() {
-        execBuf("build", "--output", bufBuildPublicationFile)
+        execBuf("build", "--output", publicationFile.get())
     }
 }

src/main/kotlin/build/buf/gradle/ConfigSupport.kt

@@ -15,7 +15,6 @@
 package build.buf.gradle
 
 import org.gradle.api.Project
-import org.gradle.api.Task
 import org.gradle.api.tasks.Copy
 import org.gradle.kotlin.dsl.register
 import java.io.File
@@ -25,7 +24,7 @@ const val COPY_BUF_CONFIG_TASK_NAME = "copyBufConfig"
 internal fun Project.configureCopyBufConfig() {
     tasks.register<Copy>(COPY_BUF_CONFIG_TASK_NAME) {
         from(listOfNotNull(bufConfigFile()))
-        into(bufbuildDir)
+        into(project.bufbuildDir)
         rename { "buf.yaml" }
     }
 }
@@ -47,8 +46,6 @@ internal fun Project.bufConfigFile() =
         }
     }
 
-internal fun Task.bufConfigFile() = project.bufConfigFile()
-
 private fun Project.resolveConfig(): File? {
     val ext = getExtension()
     return configurations.getByName(BUF_CONFIGURATION_NAME).let {