You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@groovy.apache.org by jw...@apache.org on 2017/05/28 13:53:01 UTC
[1/2] groovy git commit: require JDK 8+ for release builds
Repository: groovy
Updated Branches:
refs/heads/GROOVY_2_5_X 039476ec2 -> 4c7bec0a8
require JDK 8+ for release builds
Related to change for GROOVY-7611 (PR #545), JDK 8+
is required in order to compile all features.
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/c2fd0a01
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/c2fd0a01
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/c2fd0a01
Branch: refs/heads/GROOVY_2_5_X
Commit: c2fd0a01f044e651f7bb8ae70d52fa82b9c686aa
Parents: 039476e
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat May 27 15:21:43 2017 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sun May 28 06:43:22 2017 -0700
----------------------------------------------------------------------
build.gradle | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/c2fd0a01/build.gradle
----------------------------------------------------------------------
diff --git a/build.gradle b/build.gradle
index 63fedc7..51f64d0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -470,18 +470,17 @@ compileTestGroovy {
groovyOptions.fork(memoryMaximumSize: groovycTest_mx)
}
-// TODO superfluous to check for JDK7 for Gradle version 3.2+ but leave for future?
task checkCompatibility {
doLast {
- assert JavaVersion.current().java7Compatible
+ assert JavaVersion.current().isJava8Compatible()
}
}
-if (!JavaVersion.current().java7Compatible) {
+if (!JavaVersion.current().isJava8Compatible()) {
logger.lifecycle '''
**************************************** WARNING ********************************************
- ****** You are running the build with an older JDK. NEVER try to release with 1.6. ******
- ****** You must use a JDK 1.7+ in order to compile all features of the language. ******
+ ****** You are running the build with an older JDK. NEVER try to release with 1.7. ******
+ ****** You must use a JDK 1.8+ in order to compile all features of the language. ******
*********************************************************************************************
'''
}
[2/2] groovy git commit: include JSR223 DGMs in generated GDK docs
(closes #553)
Posted by jw...@apache.org.
include JSR223 DGMs in generated GDK docs (closes #553)
Project: http://git-wip-us.apache.org/repos/asf/groovy/repo
Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/4c7bec0a
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/4c7bec0a
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/4c7bec0a
Branch: refs/heads/GROOVY_2_5_X
Commit: 4c7bec0a8ef4678728005c5e88e9d550d8f35cde
Parents: c2fd0a0
Author: John Wagenleitner <jw...@apache.org>
Authored: Sat May 27 15:23:58 2017 -0700
Committer: John Wagenleitner <jw...@apache.org>
Committed: Sun May 28 06:51:20 2017 -0700
----------------------------------------------------------------------
gradle/docs.gradle | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/groovy/blob/4c7bec0a/gradle/docs.gradle
----------------------------------------------------------------------
diff --git a/gradle/docs.gradle b/gradle/docs.gradle
index cf96d7b..5919e8c 100644
--- a/gradle/docs.gradle
+++ b/gradle/docs.gradle
@@ -160,6 +160,8 @@ task docGDK {
arg(value: 'subprojects/groovy-swing/src/main/java/org/codehaus/groovy/runtime/SwingGroovyMethods.java')
arg(value: 'subprojects/groovy-xml/src/main/java/org/codehaus/groovy/runtime/XmlGroovyMethods.java')
arg(value: 'subprojects/groovy-nio/src/main/java/org/codehaus/groovy/runtime/NioGroovyMethods.java')
+ arg(value: 'subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptExtensions.java')
+ arg(value: 'subprojects/groovy-jsr223/src/main/java/org/codehaus/groovy/jsr223/ScriptStaticExtensions.java')
}
}
} finally {