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/871f4957
Tree: http://git-wip-us.apache.org/repos/asf/incubator-groovy/tree/871f4957
Diff: http://git-wip-us.apache.org/repos/asf/incubator-groovy/diff/871f4957

Branch: refs/heads/GROOVY_2_4_X
Commit: 871f4957948e3a8ccba287ed9678194eecde244a
Parents: 0327b62
Author: Paul King <pa...@asert.com.au>
Authored: Tue May 19 23:27:05 2015 +1000
Committer: Paul King <pa...@asert.com.au>
Committed: Thu May 21 17:50:52 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/871f4957/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 6298c53..a6046aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -272,7 +272,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/871f4957/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index f7f84e3..f5f3abb 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -128,7 +128,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 {
@@ -136,7 +136,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')

Reply via email to