Repository: groovy Updated Branches: refs/heads/GROOVY_2_6_X ae670894f -> 5d2d09862
for versions 2.5+, jdk will be >= 7 Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/acfc2221 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/acfc2221 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/acfc2221 Branch: refs/heads/GROOVY_2_6_X Commit: acfc22212dcb3e26d963b67e427dde637ce1224a Parents: ae67089 Author: paulk <[email protected]> Authored: Wed Jan 3 16:40:30 2018 +1000 Committer: paulk <[email protected]> Committed: Wed Jan 3 17:26:23 2018 +1000 ---------------------------------------------------------------------- build.gradle | 4 +--- gradle/docs.gradle | 17 ++++++----------- gradle/indy.gradle | 2 +- 3 files changed, 8 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/acfc2221/build.gradle ---------------------------------------------------------------------- diff --git a/build.gradle b/build.gradle index 206d161..aae466d 100644 --- a/build.gradle +++ b/build.gradle @@ -109,9 +109,7 @@ allprojects { apply plugin: 'groovy' apply from: "${rootProject.projectDir}/gradle/indy.gradle" - if (JavaVersion.current().java7Compatible) { - apply from: "${rootProject.projectDir}/gradle/asciidoctor.gradle" - } + apply from: "${rootProject.projectDir}/gradle/asciidoctor.gradle" tasks.withType(org.asciidoctor.gradle.AsciidoctorTask) { outputs.cacheIf { true } http://git-wip-us.apache.org/repos/asf/groovy/blob/acfc2221/gradle/docs.gradle ---------------------------------------------------------------------- diff --git a/gradle/docs.gradle b/gradle/docs.gradle index 0f4c123..4057627 100644 --- a/gradle/docs.gradle +++ b/gradle/docs.gradle @@ -17,22 +17,17 @@ * under the License. */ -task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK']) { - if (JavaVersion.current().java7Compatible) { - dependsOn 'asciidocAll' - } +task doc(dependsOn: ['javadocAll', 'groovydocAll', 'docGDK', 'asciidocAll']) { ext.footer = 'Copyright © 2003-2017 The Apache Software Foundation. All rights reserved.' ext.title = "Groovy ${groovyVersion}" } -if (JavaVersion.current().java7Compatible) { - task asciidocAll(type: Copy) { - allprojects { - dependsOn asciidoctor - from asciidoctor.outputDir - } - into "$buildDir/asciidocAll" +task asciidocAll(type: Copy) { + allprojects { + dependsOn asciidoctor + from asciidoctor.outputDir } + into "$buildDir/asciidocAll" } def javadocSpec = { http://git-wip-us.apache.org/repos/asf/groovy/blob/acfc2221/gradle/indy.gradle ---------------------------------------------------------------------- diff --git a/gradle/indy.gradle b/gradle/indy.gradle index 70968ad..f2262c1 100644 --- a/gradle/indy.gradle +++ b/gradle/indy.gradle @@ -21,5 +21,5 @@ // with regards to invoke dynamic support (indy) rootProject.ext.indyCapable = { - !rootProject.hasProperty('skipIndy') && JavaVersion.current().java7Compatible + !rootProject.hasProperty('skipIndy') }
