fix test

bufbuild · Nov 15, 2024 · 4dd4efd · 4dd4efd
1 parent 86a7374
commit 4dd4efd
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/main/kotlin/build/buf/gradle/LintConfiguration.kt b/src/main/kotlin/build/buf/gradle/LintConfiguration.kt
@@ -27,6 +27,7 @@ internal fun Project.configureLint() {
 
         bufConfigFile.set(project.bufConfigFile())
         inputFiles.setFrom(obtainDefaultProtoFileSet())
+        v1SyntaxOnly.set(bufV1SyntaxOnly())
     }
 
     tasks.named(CHECK_TASK_NAME).dependsOn(BUF_LINT_TASK_NAME)

diff --git a/src/main/kotlin/build/buf/gradle/LintTask.kt b/src/main/kotlin/build/buf/gradle/LintTask.kt
@@ -16,6 +16,7 @@ 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.InputFile
 import org.gradle.api.tasks.InputFiles
 import org.gradle.api.tasks.Optional
@@ -34,11 +35,18 @@ abstract class LintTask : AbstractBufExecTask() {
     @get:Optional
     internal abstract val bufConfigFile: Property<File>
 
+    @get:Input
+    internal abstract val v1SyntaxOnly: Property<Boolean>
+
     @TaskAction
     fun bufLint() {
         execBufInSpecificDirectory(
             "lint",
-            bufConfigFile.orNull?.let { listOf("--config", it.readAndStripComments()) }?.takeIf { !hasWorkspace.get() }.orEmpty(),
+            if (v1SyntaxOnly.get() && !hasWorkspace.get()) {
+                bufConfigFile.orNull?.let { listOf("--config", it.readAndStripComments()) }
+            } else {
+                null
+            }.orEmpty(),
         ) {
             """
                  |Some Protobuf files had lint violations:

diff --git a/...n_implementation_dependency_and_a_lint_config_with_the_protobuf_gradle_plugin_v2/buf.yaml b/...n_implementation_dependency_and_a_lint_config_with_the_protobuf_gradle_plugin_v2/buf.yaml
@@ -4,6 +4,6 @@ lint:
     - google
     - protokt
   use:
-    - DEFAULT
+    - STANDARD
   except:
     - ENUM_ZERO_VALUE_SUFFIX