You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by su...@apache.org on 2018/12/03 16:35:58 UTC

groovy git commit: GROOVY-8908: Bump gradle to 5.0(closes #835)

Repository: groovy
Updated Branches:
  refs/heads/master e22974b0e -> ec52f9425


GROOVY-8908: Bump gradle to 5.0(closes #835)

gradle plugins have to be bumped together


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

Branch: refs/heads/master
Commit: ec52f9425312bfa453c758480ad028496f4c1e4a
Parents: e22974b
Author: Daniel Sun <su...@apache.org>
Authored: Tue Dec 4 00:35:45 2018 +0800
Committer: Daniel Sun <su...@apache.org>
Committed: Tue Dec 4 00:35:45 2018 +0800

----------------------------------------------------------------------
 build.gradle                             |   2 +-
 gradle.properties                        |   2 +-
 gradle/wrapper/gradle-wrapper.jar        | Bin 56177 -> 56177 bytes
 gradle/wrapper/gradle-wrapper.properties |   2 +-
 subprojects/parser-antlr4/build.gradle   |   4 +++-
 subprojects/performance/build.gradle     |   2 +-
 6 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/groovy/blob/ec52f942/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 80a8f4f..3dbc1a1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -49,7 +49,7 @@ buildscript {
 }
 
 plugins {
-    id 'com.gradle.build-scan' version '1.16'
+    id 'com.gradle.build-scan' version '2.0.2'
     id 'me.champeau.buildscan-recipes' version '0.2.3'
     id 'com.github.spotbugs' version '1.6.5'
     id "com.github.ben-manes.versions" version '0.20.0'

http://git-wip-us.apache.org/repos/asf/groovy/blob/ec52f942/gradle.properties
----------------------------------------------------------------------
diff --git a/gradle.properties b/gradle.properties
index 71496c8..4510a1f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ groovyVersion = 3.0.0-SNAPSHOT
 # bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits)
 groovyBundleVersion = 3.0.0.SNAPSHOT
 
-gradle_version=4.10.2
+gradle_version=5.0
 
 groovyJUnit_ms=512m
 groovyJUnit_mx=1g

http://git-wip-us.apache.org/repos/asf/groovy/blob/ec52f942/gradle/wrapper/gradle-wrapper.jar
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 1353677..29953ea 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ

http://git-wip-us.apache.org/repos/asf/groovy/blob/ec52f942/gradle/wrapper/gradle-wrapper.properties
----------------------------------------------------------------------
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index e0b3fb8..75b8c7c 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

http://git-wip-us.apache.org/repos/asf/groovy/blob/ec52f942/subprojects/parser-antlr4/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/parser-antlr4/build.gradle b/subprojects/parser-antlr4/build.gradle
index 33de21a..f813360 100644
--- a/subprojects/parser-antlr4/build.gradle
+++ b/subprojects/parser-antlr4/build.gradle
@@ -30,9 +30,11 @@ def srcBase = "subprojects/parser-antlr4/src"
 def srcMain = "$srcBase/main"
 def srcTest = "$srcBase/test"
 
-final PARSER_PACKAGE_NAME = 'org.apache.groovy.parser.antlr4'
 generateGrammarSource {
+    maxHeapSize = '1g'
     outputs.cacheIf { true }
+
+    final PARSER_PACKAGE_NAME = 'org.apache.groovy.parser.antlr4'
     arguments += ["-visitor", "-no-listener", "-package", PARSER_PACKAGE_NAME]
 
     doLast {

http://git-wip-us.apache.org/repos/asf/groovy/blob/ec52f942/subprojects/performance/build.gradle
----------------------------------------------------------------------
diff --git a/subprojects/performance/build.gradle b/subprojects/performance/build.gradle
index d1f5ff4..362b4b3 100644
--- a/subprojects/performance/build.gradle
+++ b/subprojects/performance/build.gradle
@@ -20,7 +20,7 @@
 import java.text.DecimalFormat
 
 plugins {
-    id "me.champeau.gradle.jmh" version "0.4.2"
+    id "me.champeau.gradle.jmh" version "0.4.7"
 }
 
 configurations {