Pass filtered proto sources to generate proto task

fix: #620
google · Oct 7, 2022 · aaa0997 · aaa0997
1 parent 4f95b10
commit aaa0997
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy b/src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy
@@ -248,7 +248,7 @@ class ProtobufPlugin implements Plugin<Project> {
       Provider<ProtobufExtract> extractIncludeProtosTask = setupExtractIncludeProtosTask(
           sourceSet.name, compileProtoPath, sourceSet.compileClasspath)
       Provider<GenerateProtoTask> generateProtoTask = addGenerateProtoTask(
-          sourceSet.name, protoSrcDirSet.sourceDirectories, project.files(extractProtosTask),
+          sourceSet.name, protoSrcDirSet, project.files(extractProtosTask),
           extractIncludeProtosTask) {
         it.sourceSet = sourceSet
         it.doneInitializing()
@@ -321,7 +321,7 @@ class ProtobufPlugin implements Plugin<Project> {
 
       // GenerateProto task, one per variant (compilation unit).
       FileCollection sourceDirs = project.files(project.providers.provider {
-          variant.sourceSets.collect { it.proto.sourceDirectories }
+          variant.sourceSets.collect { it.proto }
       })
       FileCollection extractProtosDirs = project.files(project.providers.provider {
         variant.sourceSets.collect {