Support plugins without an ExecutableLocator

ateirney · ateirney · commit 3a311bae8bd8 · 2023-05-02T21:08:42.000+12:00
diff --git a/src/main/groovy/com/google/protobuf/gradle/GenerateProtoTask.groovy b/src/main/groovy/com/google/protobuf/gradle/GenerateProtoTask.groovy
@@ -355,7 +355,7 @@ public abstract class GenerateProtoTask extends DefaultTask {
   }
 
   private List<ExecutableLocator> getAllExecutableLocators() {
-    [toolsLocator.protoc] + plugins.collect { PluginOptions it -> toolsLocator.plugins.getByName(it.name) }
+    [toolsLocator.protoc] + plugins.findResults { PluginOptions it -> toolsLocator.plugins.findByName(it.name) }
   }
 
   @Internal("Not an actual input to the task, only used to find tasks belonging to a variant")

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ public abstract class GenerateProtoTask extends DefaultTask {`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`private List<ExecutableLocator> getAllExecutableLocators() {`
`358`		`- [toolsLocator.protoc] + plugins.collect { PluginOptions it -> toolsLocator.plugins.getByName(it.name) }`
	`358`	`+ [toolsLocator.protoc] + plugins.findResults { PluginOptions it -> toolsLocator.plugins.findByName(it.name) }`
`359`	`359`	`}`
`360`	`360`
`361`	`361`	`@Internal("Not an actual input to the task, only used to find tasks belonging to a variant")`