You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by cc...@apache.org on 2017/06/16 09:41:52 UTC
groovy git commit: Upgrade to Gradle 4.0
Repository: groovy
Updated Branches:
refs/heads/master f9282ff13 -> dfd30db7d
Upgrade to Gradle 4.0
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/dfd30db7
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/dfd30db7
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/dfd30db7
Branch: refs/heads/master
Commit: dfd30db7d294233c2c737177aa1b13b6dfeadb8a
Parents: f9282ff
Author: Cedric Champeau <cc...@apache.org>
Authored: Fri Jun 16 11:38:52 2017 +0200
Committer: Cedric Champeau <cc...@apache.org>
Committed: Fri Jun 16 11:38:52 2017 +0200
----------------------------------------------------------------------
build.gradle | 6 ++++--
gradle/quality.gradle | 5 +----
gradle/wrapper/gradle-wrapper.properties | 8 ++++++++
gradlew | 6 +++---
4 files changed, 16 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/dfd30db7/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index e59b82e..4096b03 100644
--- a/build.gradle
+++ b/build.gradle
@@ -51,14 +51,16 @@ buildscript {
}
plugins {
- id 'com.gradle.build-scan' version '1.6'
- id 'me.champeau.buildscan-recipes' version '0.1.7'
+ id 'com.gradle.build-scan' version '1.8'
}
buildScan {
licenseAgreementUrl = 'https://gradle.com/terms-of-service'
licenseAgree = 'yes'
publishAlways()
+}
+
+buildScanRecipes {
recipe 'git-commit', baseUrl: 'https://github.com/apache/groovy/tree'
recipe 'teamcity', baseUrl: 'https://ci.groovy-lang.org', guest: 'true'
recipes 'git-status', 'gc-stats', 'teamcity', 'travis-ci'
http://git-wip-us.apache.org/repos/asf/groovy/blob/dfd30db7/gradle/quality.gradle
----------------------------------------------------------------------
diff --git a/gradle/quality.gradle b/gradle/quality.gradle
index b0a4bcf..9b430a8 100644
--- a/gradle/quality.gradle
+++ b/gradle/quality.gradle
@@ -138,10 +138,7 @@ allprojects {
html.enabled = true
}
maxHeapSize = '2g'
- // hack to exclude html files since include by itself doesn't work
- def temp = classes
- temp.include '**/*.class'
- classes = temp
+ classes = classes.asFileTree.filter { it.name.endsWith('.class') }
}
}
http://git-wip-us.apache.org/repos/asf/groovy/blob/dfd30db7/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 540f96f..02171eb 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,14 @@
+<<<<<<< Updated upstream
#Fri Jun 16 08:33:40 CST 2017
+=======
+#Fri Jun 16 11:19:26 CEST 2017
+>>>>>>> Stashed changes
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
+<<<<<<< Updated upstream
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+=======
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.0-bin.zip
+>>>>>>> Stashed changes
http://git-wip-us.apache.org/repos/asf/groovy/blob/dfd30db7/gradlew
----------------------------------------------------------------------
diff --git a/gradlew b/gradlew
index 4453cce..cccdd3d 100755
--- a/gradlew
+++ b/gradlew
@@ -33,11 +33,11 @@ DEFAULT_JVM_OPTS=""
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -155,7 +155,7 @@ if $cygwin ; then
fi
# Escape application args
-save ( ) {
+save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}