groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject groovy git commit: make build more robust against gradle breaking changes in 3+
Date Sat, 31 Dec 2016 12:21:41 GMT
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 0f49de071 -> 778a67c1d


make build more robust against gradle breaking changes in 3+


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 778a67c1d71f558b824bdd458d5ac972a4faa2ed
Parents: 0f49de0
Author: paulk <paulk@asert.com.au>
Authored: Sat Dec 31 22:21:14 2016 +1000
Committer: paulk <paulk@asert.com.au>
Committed: Sat Dec 31 22:21:14 2016 +1000

----------------------------------------------------------------------
 gradle/docs.gradle | 35 ++++++++++++++++++++---------------
 1 file changed, 20 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/778a67c1/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 892c299..f44f04c 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -53,21 +53,26 @@ def javadocSpec = {
 }
 
 def groovydocSpec = {
-    use = true
-    if (project != rootProject) source = project.sourceSets.main.allSource
-    classpath = javadoc.classpath
-    ext.windowtitle = doc.title
-    ext.doctitle = doc.title
-    header = doc.title
-    footer = doc.footer
-    overview = rootProject.file('src/main/overview.html')
-    includePrivate = false
-    link 'http://docs.oracle.com/javaee/7/api/', 'javax.servlet.', 'javax.management.'
-    link 'http://docs.oracle.com/javase/8/docs/api/', 'java.', 'org.xml.', 'javax.', 'org.w3c.'
-    link 'http://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.', 'org.apache.tools.ant.'
-    link 'http://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.'
-    link 'http://www.antlr2.org/javadoc/', 'antlr.'
-    link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.'
+    // hack to avoid errors when using gradle 3 to get the wrapper
+    // we won't ever build 2.4.x using a 3+ version - at least not
+    // without further changes
+    if (gradle.gradleVersion.startsWith('2.')) {
+        use = true
+        if (project != rootProject) source = project.sourceSets.main.allSource
+        classpath = javadoc.classpath
+        ext.windowtitle = doc.title
+        ext.doctitle = doc.title
+        header = doc.title
+        footer = doc.footer
+        overview = rootProject.file('src/main/overview.html')
+        includePrivate = false
+        link 'http://docs.oracle.com/javaee/7/api/', 'javax.servlet.', 'javax.management.'
+        link 'http://docs.oracle.com/javase/8/docs/api/', 'java.', 'org.xml.', 'javax.',
'org.w3c.'
+        link 'http://docs.groovy-lang.org/docs/ant/api/', 'org.apache.ant.', 'org.apache.tools.ant.'
+        link 'http://junit.org/junit4/javadoc/latest/', 'org.junit.', 'junit.'
+        link 'http://www.antlr2.org/javadoc/', 'antlr.'
+        link 'http://commons.apache.org/proper/commons-cli/javadocs/api-release/', 'org.apache.commons.cli.'
+    }
 }
 
 allprojects {


Mime
View raw message