[groovy] branch master updated: remove now redundant JDK version checks

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[groovy] branch master updated: remove now redundant JDK version checks

paulk
This is an automated email from the ASF dual-hosted git repository.

paulk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/groovy.git


The following commit(s) were added to refs/heads/master by this push:
     new aa6cd3e  remove now redundant JDK version checks
aa6cd3e is described below

commit aa6cd3e9c8a71fa2f551a7a84987f02aaa5846be
Author: Paul King <[hidden email]>
AuthorDate: Sun Mar 29 19:58:31 2020 +1000

    remove now redundant JDK version checks
---
 build.gradle       | 12 ------------
 gradle/docs.gradle | 10 ++++------
 gradle/test.gradle |  4 +---
 3 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/build.gradle b/build.gradle
index 4d0b26d..ada0c93 100644
--- a/build.gradle
+++ b/build.gradle
@@ -219,10 +219,6 @@ sourceSets {
     main {
         java {
             srcDir "$generatedDirectory/antlr2/src/main"
-            if (!JavaVersion.current().isJava8Compatible()) {
-                exclude '**/v8/*'
-                exclude '**/vm8/*'
-            }
             if (!JavaVersion.current().isJava9Compatible()) {
                 exclude '**/v9/*'
                 exclude '**/vm9/*'
@@ -230,10 +226,6 @@ sourceSets {
         }
         groovy {
             srcDir "$generatedDirectory/antlr2/src/main"
-            if (!JavaVersion.current().isJava8Compatible()) {
-                exclude '**/v8/*'
-                exclude '**/vm8/*'
-            }
             if (!JavaVersion.current().isJava9Compatible()) {
                 exclude '**/v9/*'
                 exclude '**/vm9/*'
@@ -251,10 +243,6 @@ sourceSets {
     test {
         groovy {
             srcDirs = ['src/test']
-            if (!JavaVersion.current().isJava8Compatible()) {
-                exclude '**/v8/*'
-                exclude '**/vm8/*'
-            }
             if (!JavaVersion.current().isJava9Compatible()) {
                 exclude '**/v9/*'
                 exclude '**/vm9/*'
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index 8e8805a..4336dc8 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -192,11 +192,9 @@ task docGDK {
 
 javadocAll.options.source = '1.8'
 
-if (JavaVersion.current().isJava8Compatible()) {
-    allprojects {
-        tasks.withType(Javadoc) {
-            // disable the crazy super-strict doclint tool in Java 8
-            options.addStringOption('Xdoclint:none', '-quiet')
-        }
+allprojects {
+    tasks.withType(Javadoc) {
+        // disable the crazy super-strict doclint tool in Java 8
+        options.addStringOption('Xdoclint:none', '-quiet')
     }
 }
diff --git a/gradle/test.gradle b/gradle/test.gradle
index 0069905..8a9a1ef 100644
--- a/gradle/test.gradle
+++ b/gradle/test.gradle
@@ -25,10 +25,8 @@ allprojects {
         if (JavaVersion.current().isJava9Compatible()) {
             jvmArgs (*common, *jdk9)
             systemProperty "groovy.force.illegal.access", findProperty("groovy.force.illegal.access")
-        } else if (JavaVersion.current().isJava8Compatible()) {
-            jvmArgs (*common, *jdk8)
         } else {
-            jvmArgs (*common, "-XX:PermSize=${groovyJUnit_permSize}", "-XX:MaxPermSize=${groovyJUnit_maxPermSize}")
+            jvmArgs (*common, *jdk8)
         }
         def headless = System.properties['java.awt.headless']
         if (headless == 'true') {