Paudi Moriarty avatar Paudi Moriarty committed 70df869 Merge

Merging with latest upstream

Comments (0)

Files changed (3)

 ## Issues
 
 This is **alpha** software! Expect problems! Please report issues in the
-bugtracker at [the lighthouse tracker][lh]. Or email them to me.
+bugtracker at [bitbucket][bb]. Or email them to me.
 
 General support is available on the [clojuresque google group][cgg].
 
 [Gradle]: http://www.gradle.org
 [Groovy]: http://groovy.codehaus.org
 [clj]:    http://clojure.org
-[cg]:     http://bitbucket.org/kotarak/clojuresque
-[lh]:     http://kotka.lighthouseapp.com/projects/45093-clojuresque/overview
+[cg]:     http://bitbucket.org/clojuresque/clojuresque
+[bb]:     http://bitbucket.org/clojuresque/clojuresque/issues
 [cr]:     http://clojars.org
 [hudson]: http://build.clojure.org
 [antbug]: https://issues.apache.org/bugzilla/show_bug.cgi?id=41090
-buildscript {
-    repositories {
-        mavenCentral()
-        maven { url "http://clojars.org/repo" }
-    }
-
-    dependencies {
-        classpath "de.kotka.gradle:gradle-plugin:1.1.0"
-    }
-}
-
 subprojects {
     group = 'clojuresque'
     version = '1.6.0-SNAPSHOT'
         compile gradleApi()
         compile localGroovy()
 
-        compile "de.kotka.gradle:gradle-utils:0.1.0"
+        compile "de.kotka.gradle:gradle-utils:0.1.1"
 
         testCompile('org.spockframework:spock-core:0.7-groovy-1.8') {
             exclude group: 'org.codehaus.groovy', module: 'groovy-all'

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

                 delayedDestinationDir = {
                     project.file(project.docsDir.path + "/clojuredoc")
                 }
-                jvmOpts = { compileTask.jvmOpts }
+                jvmOptions = { compileTask.jvmOptions }
                 source set.clojure
                 clojureRoots = set.clojure
                 delayedClasspath = { compileTask.classpath }
                 type: ClojureTestTask) {
             source project.sourceSets.test.clojure
             testRoots = project.sourceSets.test.clojure
-            delayedJvmOpts = { compileTask.jvmOpts }
+            delayedJvmOptions = { compileTask.jvmOptions }
             delayedClasspath  = { project.configurations.testRuntime }
             delayedClassesDir = { project.sourceSets.main.output.classesDir }
             delayedJunitOutputDir = {
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.