Commits

Meikel Brandmeyer committed c0823c6

Unify classpath option nameing

Comments (0)

Files changed (4)

clojuresque/src/main/groovy/clojuresque/ClojureBasePlugin.groovy

                 destinationDir = set.output.classesDir
                 source set.clojure
                 clojureRoots = set.clojure
-                compileClasspath = set.compileClasspath
+                classpath = set.compileClasspath
                 dependsOn set.compileClasspath, project.configurations.development
                 description =
                     String.format("Compile the %s Clojure source.",
                 )
                 source set.clojure
                 clojureRoots = set.clojure
-                compileClasspath = set.compileClasspath
+                classpath = set.compileClasspath
                 dependsOn set.compileClasspath
                 description =
                     String.format("Generate documentation for the %s Clojure source.",
                 type: ClojureTestTask.class) {
             source project.sourceSets.test.clojure
             testRoots = project.sourceSets.test.clojure
-            testClasspath = project.configurations.testRuntime
+            classpath = project.configurations.testRuntime
             classesDir = project.sourceSets.main.output.classesDir
             dependsOn project.tasks.classes, project.configurations.testRuntime
             description = "Run Clojure tests in src/test."

clojuresque/src/main/groovy/clojuresque/ClojureCompileTask.groovy

 
 public class ClojureCompileTask extends ClojureSourceTask {
     def File destinationDir
-    def FileCollection compileClasspath
+    def FileCollection classpath
     def SourceDirectorySet clojureRoots
     def Closure jvmOptions = {}
 
     }
 
     @InputFiles
-    public FileCollection getCompileClasspath() {
-        return this.compileClasspath
+    public FileCollection getClasspath() {
+        return this.classpath
     }
 
-    public void compileClasspath(Object... coll) {
-        compileClasspath = compileClasspath.plus(project.files(coll))
+    public void classpath(Object... coll) {
+        classpath = classpath.plus(project.files(coll))
     }
 
     @TaskAction
             classpath = project.files(
                 this.clojureRoots.srcDirs,
                 this.destinationDir,
-                this.compileClasspath
+                this.classpath
             )
             main = "clojuresque.tasks.compile/main"
             args = options + this.source.files

clojuresque/src/main/groovy/clojuresque/ClojureDocTask.groovy

 
 public class ClojureDocTask extends ClojureSourceTask {
     def File destinationDir
-    def FileCollection compileClasspath
+    def FileCollection classpath
     def SourceDirectorySet clojureRoots
     def Closure jvmOptions = {}
 
     }
 
     @InputFiles
-    public FileCollection getCompileClasspath() {
-        return this.compileClasspath
+    public FileCollection getClasspath() {
+        return this.classpath
     }
 
-    public void compileClasspath(Object... coll) {
-        compileClasspath = compileClasspath.plus(project.files(coll))
+    public void classpath(Object... coll) {
+        classpath = classpath.plus(project.files(coll))
     }
 
     @TaskAction
             this.jvmOptions()
             classpath = project.files(
                 this.clojureRoots.srcDirs,
-                this.compileClasspath
+                this.classpath
             )
             main = "clojuresque.tasks.doc/main"
             args = [

clojuresque/src/main/groovy/clojuresque/ClojureTestTask.groovy

 
 public class ClojureTestTask extends ClojureSourceTask {
     def File classesDir
-    def FileCollection testClasspath
+    def FileCollection classpath
     def SourceDirectorySet testRoots
     def Closure jvmOptions = {}
     def List<String> tests = []
 
     @InputFiles
     public FileCollection getTestClasspath() {
-        return this.testClasspath
+        return this.classpath
     }
 
-    public void testClasspath(Object... coll) {
-        testClasspath = testClasspath.plus(project.files(coll))
+    public void classpath(Object... coll) {
+        classpath = classpath.plus(project.files(coll))
     }
 
     @TaskAction
             classpath = project.files(
                 this.testRoots.srcDirs,
                 this.classesDir,
-                this.testClasspath
+                this.classpath
             )
             if (tests.size() == 0) {
                 main = "clojuresque.tasks.test/test-namespaces"