Skip to content

Commit e3f1306

Browse files
authored
Merge pull request #49 from nebula-plugins/fix-ClojureCompile
ClojureCompile: fix access to objectFactory when using deleteDerivedFiles
2 parents ad09456 + a547347 commit e3f1306

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

src/main/groovy/nebula/plugin/clojuresque/tasks/ClojureCompile.groovy

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,14 @@ abstract class ClojureCompile extends ClojureSourceTask {
9797
"file-dependencies"
9898
)
9999

100-
def dependencyGraph = fileDependencies.invoke(source.files)
100+
ObjectFactory objectFactory = objects
101101

102+
def dependencyGraph = fileDependencies.invoke(source.files)
102103
def outOfDateInputs = [] as Set
103104
inputChangesInternal.allFileChanges.each { FileChange change ->
104105
if (change.fileType == FileType.DIRECTORY) return
105106
if (change.changeType == ChangeType.REMOVED && change.file.name.endsWith(".clj")) {
106-
deleteDerivedFiles(objects, change.file)
107+
deleteDerivedFiles(objectFactory, change.file)
107108
} else if(change.changeType in [ChangeType.ADDED, ChangeType.MODIFIED] && change.file.name.endsWith(".clj")) {
108109
outOfDateInputs << change.file
109110
}
@@ -122,7 +123,6 @@ abstract class ClojureCompile extends ClojureSourceTask {
122123
"clojuresque/tasks/compile.clj"
123124
].collect { owner.class.classLoader.getResourceAsStream it }
124125

125-
def objectFactory = objects
126126
execOperations.javaexec {
127127
setMainClass("clojure.main")
128128
args('-')
@@ -194,7 +194,7 @@ abstract class ClojureCompile extends ClojureSourceTask {
194194

195195
def pattern = relativeParent.replaceAll("\\.clj\$", "") + "*"
196196

197-
objects.fileTree(getDestinationDir()).include(pattern).files.each {
197+
objects.fileTree().from(getDestinationDir()).include(pattern).files.each {
198198
it.delete()
199199
}
200200
}

0 commit comments

Comments
 (0)