Index: ../buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy IDEA additional info: Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP <+>UTF-8 =================================================================== --- ../buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy (revision 4118:cce3ee55acc7) +++ ../buildSrc/src/main/groovy/com/sun/javafx/gradle/NativeCompileTask.groovy (revision 4118+:cce3ee55acc7+) @@ -42,13 +42,9 @@ List params = new ArrayList(); List sourceRoots = new ArrayList(); @OutputDirectory File output; + @InputFiles List allFiles; private final PatternFilterable patternSet = new PatternSet(); - @InputFiles public void setSource(Object source) { - sourceRoots.clear(); - sourceRoots.add(source); - } - public NativeCompileTask source(Object... sources) { for (Object source : sources) { if (source instanceof Collection) { @@ -57,6 +53,12 @@ sourceRoots.add(source); } } + // Combine the different source roots into a single FileCollection based on all files in each source root + allFiles = [] + sourceRoots.each { + def dir = project.file(it); + allFiles += dir.isDirectory() ? dir.listFiles() : dir; + } return this; } @@ -87,12 +89,6 @@ } project.mkdir(output); - // Combine the different source roots into a single FileCollection based on all files in each source root - def allFiles = []; - sourceRoots.each { - def dir = project.file(it); - allFiles += dir.isDirectory() ? dir.listFiles() : dir; - } def source = project.files(allFiles); final Set files = matches == null ? new HashSet(source.files) : source.filter{it.name.matches(matches)}.files; project.logger.info("Compiling native files: $files");