Add v2 buf.yaml LintWithWorkspaceTest test cases

src/test/kotlin/build/buf/gradle/AbstractBufIntegrationTest.kt

@@ -26,7 +26,7 @@ import java.nio.file.Paths
 import java.util.Locale
 
 abstract class AbstractBufIntegrationTest : IntegrationTest {
-    @TempDir(cleanup = CleanupMode.ALWAYS)
+    @TempDir(cleanup = CleanupMode.ON_SUCCESS)
     lateinit var projectDir: File
 
     val buildFile
@@ -72,7 +72,7 @@ abstract class AbstractBufIntegrationTest : IntegrationTest {
                 "-PkotlinVersion=1.7.20",
                 "-PandroidGradleVersion=7.3.0",
             )
-            .withDebug(false) // Enable for interactive debugging
+            .withDebug(true) // Enable for interactive debugging
             .let { WrappedRunner(it) }
 
     override fun checkRunner() = gradleRunner().withArguments(CHECK_TASK_NAME)

src/test/kotlin/build/buf/gradle/LintWithWorkspaceTest.kt

@@ -21,4 +21,34 @@ class LintWithWorkspaceTest : NonProtobufGradlePluginLintTests, AbstractLintTest
     fun `lint with a config in workspace`() {
         assertSuccess()
     }
+
+    @Test
+    fun `lint a basic correct message with default config v2`() {
+        super.`lint a basic correct message with default config`()
+    }
+
+    @Test
+    fun `lint a basic correct message with default config before java plugin v2`() {
+        super.`lint a basic correct message with default config before java plugin`()
+    }
+
+    @Test
+    fun `lint a basic correct message with default config and the kotlin jvm plugin v2`() {
+        super.`lint a basic correct message with default config and the kotlin jvm plugin`()
+    }
+
+    @Test
+    fun `lint a basic correct message with default config and the kotlin android plugin v2`() {
+        super.`lint a basic correct message with default config and the kotlin android plugin`()
+    }
+
+    @Test
+    fun `lint a basic incorrect message with bad enum v2`() {
+        super.`lint a basic incorrect message with bad enum`()
+    }
+
+    @Test
+    fun `lint a file with a google dependency v2`() {
+        super.`lint a file with a google dependency`()
+    }
 }

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_and_the_kotlin_android_plugin_v2/buf.yaml

@@ -0,0 +1,3 @@
+version: v2
+modules:
+  - path: workspace

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_and_the_kotlin_android_plugin_v2/build.gradle

@@ -0,0 +1,27 @@
+buildscript {
+  repositories {
+    gradlePluginPortal()
+    google()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:$androidGradleVersion"
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+  }
+}
+
+plugins {
+  id 'build.buf'
+}
+
+apply plugin: 'com.android.library'
+apply plugin: 'org.jetbrains.kotlin.android'
+
+repositories {
+  mavenCentral()
+  google()
+}
+
+android {
+  compileSdkVersion 31
+}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_and_the_kotlin_android_plugin_v2/src/main/AndroidManifest.xml

@@ -0,0 +1,3 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="buf">
+</manifest>

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_and_the_kotlin_android_plugin_v2/workspace/buf/test/v1/test.proto

@@ -0,0 +1,19 @@
+// Copyright 2023 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.
+
+syntax = "proto3";
+
+package buf.test.v1;
+
+message BasicMessage {}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_and_the_kotlin_jvm_plugin_v2/buf.yaml

@@ -0,0 +1,3 @@
+version: v2
+modules:
+  - path: workspace

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_and_the_kotlin_jvm_plugin_v2/build.gradle

@@ -0,0 +1,8 @@
+plugins {
+  id 'org.jetbrains.kotlin.jvm' version "$kotlinVersion"
+  id 'build.buf'
+}
+
+repositories {
+  mavenCentral()
+}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_and_the_kotlin_jvm_plugin_v2/workspace/buf/test/v1/test.proto

@@ -0,0 +1,19 @@
+// Copyright 2023 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.
+
+syntax = "proto3";
+
+package buf.test.v1;
+
+message BasicMessage {}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_before_java_plugin_v2/buf.yaml

@@ -0,0 +1,3 @@
+version: v2
+modules:
+  - path: workspace

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_before_java_plugin_v2/build.gradle

@@ -0,0 +1,8 @@
+plugins {
+  id 'build.buf'
+  id 'java'
+}
+
+repositories {
+  mavenCentral()
+}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_before_java_plugin_v2/workspace/buf/test/v1/test.proto

@@ -0,0 +1,19 @@
+// Copyright 2023 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.
+
+syntax = "proto3";
+
+package buf.test.v1;
+
+message BasicMessage {}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_v2/buf.yaml

@@ -0,0 +1,3 @@
+version: v2
+modules:
+  - path: workspace

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_v2/build.gradle

@@ -0,0 +1,8 @@
+plugins {
+  id 'java'
+  id 'build.buf'
+}
+
+repositories {
+  mavenCentral()
+}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_correct_message_with_default_config_v2/workspace/buf/test/v1/test.proto

@@ -0,0 +1,19 @@
+// Copyright 2023 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.
+
+syntax = "proto3";
+
+package buf.test.v1;
+
+message BasicMessage {}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_incorrect_message_with_bad_enum_v2/buf.yaml

@@ -0,0 +1,3 @@
+version: v2
+modules:
+  - path: workspace

src/test/resources/LintWithWorkspaceTest/lint_a_basic_incorrect_message_with_bad_enum_v2/build.gradle

@@ -0,0 +1,8 @@
+plugins {
+  id 'java'
+  id 'build.buf'
+}
+
+repositories {
+  mavenCentral()
+}

src/test/resources/LintWithWorkspaceTest/lint_a_basic_incorrect_message_with_bad_enum_v2/workspace/buf/test/v1/test.proto

@@ -0,0 +1,21 @@
+// Copyright 2023 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.
+
+syntax = "proto3";
+
+package buf.test.v1;
+
+enum Test {
+  TEST_FOO = 0;
+}

src/test/resources/LintWithWorkspaceTest/lint_a_file_with_a_google_dependency_v2/buf.yaml

@@ -0,0 +1,3 @@
+version: v2
+modules:
+  - path: workspace

src/test/resources/LintWithWorkspaceTest/lint_a_file_with_a_google_dependency_v2/build.gradle

@@ -0,0 +1,8 @@
+plugins {
+  id 'java'
+  id 'build.buf'
+}
+
+repositories {
+  mavenCentral()
+}

src/test/resources/LintWithWorkspaceTest/lint_a_file_with_a_google_dependency_v2/workspace/buf/test/v1/test.proto

@@ -0,0 +1,23 @@
+// Copyright 2023 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.
+
+syntax = "proto3";
+
+package buf.test.v1;
+
+import "google/protobuf/any.proto";
+
+message BasicMessage {
+  google.protobuf.Any any = 1;
+}