Try to fix all tests by adopting new output path for generated sources

README.md

@@ -410,7 +410,7 @@ protobuf {
 
 Generated files are under `task.outputBaseDir` with a subdirectory per
 builtin and plugin. This produces a folder structure of
-``$buildDir/generated/source/proto/$sourceSet/$builtinPluginName``.
+``$buildDir/generated/sources/proto/$sourceSet/$builtinPluginName``.
 
 The subdirectory name, which is by default ``$builtinPluginName``, can be
 changed by setting the ``outputSubDir`` property in the ``builtins`` or

testProjectAndroidKotlinDsl/build.gradle.kts

@@ -310,10 +310,10 @@ fun assertJavaCompileHasProtoGeneratedDir(
     compileJavaTask: JavaCompile,
     codegenPlugins: Collection<String>
 ) {
-  val baseDir = File("${project.buildDir}/generated/source/proto/$variant")
+  val baseDir = File("${project.buildDir}/generated/sources/protos/$variant")
   // The expected direct subdirectories under baseDir
   val expectedDirs = codegenPlugins.map { codegenPlugin ->
-    File("${project.buildDir}/generated/source/proto/$variant/$codegenPlugin")
+    File("${project.buildDir}/generated/sources/proto/$variant/$codegenPlugin")
   }.toSet()
 
   val actualDirs = mutableSetOf<File>()

testProjectBase/build_base.gradle

@@ -97,9 +97,9 @@ test.doLast {
 
   // Check generateDescriptorSet option has been honored
   ['main', 'test'].each { sourceSet ->
-    assertFileExists(false, "$buildDir/generated/source/proto/$sourceSet/descriptor_set.desc")
+    assertFileExists(false, "$buildDir/generated/sources/proto/$sourceSet/descriptor_set.desc")
   }
-  assertFileExists(true, "$buildDir/generated/source/proto/grpc/descriptor_set.desc")
+  assertFileExists(true, "$buildDir/generated/sources/proto/grpc/descriptor_set.desc")
 }
 
 rootProject.ext {
@@ -108,10 +108,10 @@ rootProject.ext {
   // not include any other dirs under the generated code base dir.
   assertJavaCompileHasProtoGeneratedDir = {
       Project project, String sourceSet, JavaCompile compileJavaTask, Collection<String> codegenPlugins ->
-    def baseDir = "${project.buildDir}/generated/source/proto/$sourceSet" as File
+    def baseDir = "${project.buildDir}/generated/sources/proto/$sourceSet" as File
     // The expected direct subdirectories under baseDir
     def expectedDirs = codegenPlugins.collect { codegenPlugin ->
-      "${project.buildDir}/generated/source/proto/$sourceSet/$codegenPlugin" as File
+      "${project.buildDir}/generated/sources/proto/$sourceSet/$codegenPlugin" as File
     } as Set
 
     def actualDirs = new HashSet()

testProjectKotlinDslBase/build.gradle.kts

@@ -97,9 +97,9 @@ tasks {
             assertJavaCompileHasProtoGeneratedDir("grpc", listOf("java", "grpc_output"))
 
             listOf("main", "test").forEach { sourceSet ->
-                assertFileExists(false, "$buildDir/generated/source/proto/$sourceSet/descriptor_set.desc")
+                assertFileExists(false, "$buildDir/generated/sources/proto/$sourceSet/descriptor_set.desc")
             }
-            assertFileExists(true, "$buildDir/generated/source/proto/grpc/descriptor_set.desc")
+            assertFileExists(true, "$buildDir/generated/sources/proto/grpc/descriptor_set.desc")
         }
     }
 }
@@ -123,10 +123,10 @@ fun assertJavaCompileHasProtoGeneratedDir(
     compileJavaTask: JavaCompile,
     codegenPlugins: Collection<String>
 ) {
-    val baseDir = File("${project.buildDir}/generated/source/proto/$sourceSet")
+    val baseDir = File("${project.buildDir}/generated/sources/proto/$sourceSet")
     // The expected direct subdirectories under baseDir
     val expectedDirs = codegenPlugins.map { codegenPlugin ->
-        File("${project.buildDir}/generated/source/proto/$sourceSet/$codegenPlugin")
+        File("${project.buildDir}/generated/sources/proto/$sourceSet/$codegenPlugin")
     }.toSet()
 
     val actualDirs = mutableSetOf<File>()