Skip to content

Commit aaa0997

Browse files
committed
Pass filtered proto sources to generate proto task
fix: #620
1 parent 4f95b10 commit aaa0997

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/groovy/com/google/protobuf/gradle/ProtobufPlugin.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,7 @@ class ProtobufPlugin implements Plugin<Project> {
248248
Provider<ProtobufExtract> extractIncludeProtosTask = setupExtractIncludeProtosTask(
249249
sourceSet.name, compileProtoPath, sourceSet.compileClasspath)
250250
Provider<GenerateProtoTask> generateProtoTask = addGenerateProtoTask(
251-
sourceSet.name, protoSrcDirSet.sourceDirectories, project.files(extractProtosTask),
251+
sourceSet.name, protoSrcDirSet, project.files(extractProtosTask),
252252
extractIncludeProtosTask) {
253253
it.sourceSet = sourceSet
254254
it.doneInitializing()
@@ -321,7 +321,7 @@ class ProtobufPlugin implements Plugin<Project> {
321321

322322
// GenerateProto task, one per variant (compilation unit).
323323
FileCollection sourceDirs = project.files(project.providers.provider {
324-
variant.sourceSets.collect { it.proto.sourceDirectories }
324+
variant.sourceSets.collect { it.proto }
325325
})
326326
FileCollection extractProtosDirs = project.files(project.providers.provider {
327327
variant.sourceSets.collect {

0 commit comments

Comments
 (0)