Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Restrict getOutputSourceDirectorySet() to directories only #523

Closed
wants to merge 9 commits into from
Closed

Restrict getOutputSourceDirectorySet() to directories only #523

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
49d25f8
Restrict getOutputSourceDirectorySet() to directories only
cilki Sep 18, 2021
1733624
doc: fix typo in README
fml2 Aug 27, 2021
9677d8f
Replace Travis with GH Actions (#525)
ejona86 Sep 28, 2021
072edb2
Switch to use gradle-build-action
bigdaz Oct 28, 2021
23155ac
Remove last vestige of Travis CI
bigdaz Oct 28, 2021
e05b7ca
Simplify Kotlin DSL setup (#531)
wolfs Nov 4, 2021
be07057
Ignore empty directories for sources (#530)
wolfs Nov 5, 2021
9011d43
Check filename instead of type since the dir may not exist yet
cilki Nov 6, 2021
64d02fb
Merge branch 'google:master' into fix_get_output_source_directory_set
cilki Nov 6, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions src/main/groovy/com/google/protobuf/gradle/GenerateProtoTask.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,10 +542,16 @@ public abstract class GenerateProtoTask extends DefaultTask {
SourceDirectorySet srcSet
srcSet = objectFactory.sourceDirectorySet(srcSetName, srcSetName)
builtins.each { builtin ->
srcSet.srcDir new File(getOutputDir(builtin))
File dir = new File(getOutputDir(builtin))
if (!dir.name.endsWith(".zip") && !dir.name.endsWith(".jar")) {
srcSet.srcDir dir
}
}
plugins.each { plugin ->
srcSet.srcDir new File(getOutputDir(plugin))
File dir = new File(getOutputDir(plugin))
if (!dir.name.endsWith(".zip") && !dir.name.endsWith(".jar")) {
srcSet.srcDir dir
}
}
return srcSet
}
Expand Down