groovy git commit: fix JDK6 build

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

groovy git commit: fix JDK6 build

paulk
Repository: groovy
Updated Branches:
  refs/heads/GROOVY_2_4_X 35730b7f7 -> 8d56f032a


fix JDK6 build


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

Branch: refs/heads/GROOVY_2_4_X
Commit: 8d56f032abfb37a8ef805afd16379a563d10a6f7
Parents: 35730b7
Author: paulk <[hidden email]>
Authored: Thu Mar 16 21:44:10 2017 +1000
Committer: paulk <[hidden email]>
Committed: Thu Mar 16 21:44:10 2017 +1000

----------------------------------------------------------------------
 build.gradle | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/8d56f032/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 58410c0..12bcc08 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,21 +39,23 @@ buildscript {
         //classpath 'me.champeau.gradle:japicmp-gradle-plugin:0.1.1'
         //classpath 'nl.javadude.gradle.plugins:license-gradle-plugin:0.11.0'
         classpath "gradle.plugin.org.nosphere.apache:creadur-rat-gradle:0.1.3"
+        classpath 'com.gradle:build-scan-plugin:1.6'
+        classpath 'me.champeau.gradle:buildscan-recipes-plugin:0.1.7'
     }
 }
 
-plugins {
-    id 'com.gradle.build-scan' version '1.6'
-    id 'me.champeau.buildscan-recipes' version '0.1.7'
-}
-
-buildScan {
-    licenseAgreementUrl = 'https://gradle.com/terms-of-service'
-    licenseAgree = 'yes'
-    publishAlways()
-    recipe 'git-commit', baseUrl: 'https://github.com/apache/groovy/tree'
-    recipe 'teamcity', baseUrl: 'https://ci.groovy-lang.org', guest: 'true'
-    recipes 'git-status', 'teamcity', 'travis-ci'
+if (JavaVersion.current().java7Compatible) {
+    apply plugin: 'com.gradle.build-scan'
+    apply plugin: 'me.champeau.buildscan-recipes'
+
+    buildScan {
+        licenseAgreementUrl = 'https://gradle.com/terms-of-service'
+        licenseAgree = 'yes'
+        publishAlways()
+        recipe 'git-commit', baseUrl: 'https://github.com/apache/groovy/tree'
+        recipe 'teamcity', baseUrl: 'https://ci.groovy-lang.org', guest: 'true'
+        recipes 'git-status', 'teamcity', 'travis-ci'
+    }
 }
 
 apply from: 'gradle/filter.gradle'