You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@groovy.apache.org by pa...@apache.org on 2015/05/19 15:27:29 UTC

incubator-groovy git commit: tweak gradle classpath for docGDK

Repository: incubator-groovy
Updated Branches:
  refs/heads/master 5b2625998 -> b51c1c425


tweak gradle classpath for docGDK


Project: http://git-wip-us.apache.org/repos/asf/incubator-groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-groovy/commit/b51c1c42
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/b51c1c42
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/b51c1c42

Branch: refs/heads/master
Commit: b51c1c42580960e03d803b88522273837488a04a
Parents: 5b26259
Author: Paul King <pa...@asert.com.au>
Authored: Tue May 19 23:27:05 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Tue May 19 23:27:05 2015 +1000

----------------------------------------------------------------------
 build.gradle       | 2 +-
 gradle/docs.gradle | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/b51c1c42/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index e5afac1..b9d92cc 100644
--- a/build.gradle
+++ b/build.gradle
@@ -256,7 +256,7 @@ sourceSets {
         }
     }
     tools {
-        compileClasspath = configurations.tools + sourceSets.main.runtimeClasspath
+        compileClasspath = sourceSets.main.runtimeClasspath + configurations.tools
         runtimeClasspath = output + compileClasspath
     }
     examples {

http://git-wip-us.apache.org/repos/asf/incubator-groovy/blob/b51c1c42/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index d172c93..6e78c92 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -129,7 +129,7 @@ task docGDK {
     }
     dependsOn docProjectVersionInfo
     ext.destinationDir = "$buildDir/html/groovy-jdk"
-    inputs.files sourceSets.tools.runtimeClasspath
+    inputs.files sourceSets.main.runtimeClasspath + configurations.tools
     outputs.dir destinationDir
     doLast { task ->
         try {
@@ -137,7 +137,7 @@ task docGDK {
                 java(classname: 'org.codehaus.groovy.tools.DocGenerator',
                      fork: 'true',
                      failonerror: 'true',
-                     classpath: (configurations.tools + groovydocAll.groovyClasspath).asPath,
+                     classpath: (sourceSets.main.runtimeClasspath + configurations.tools + groovydocAll.groovyClasspath).asPath,
                      errorproperty: 'edr',
                      outputproperty: 'odr') {
                     arg(value: '-title')