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 2020/03/21 05:24:29 UTC
[groovy] branch master updated: Add JDK 14 build to travis CI
This is an automated email from the ASF dual-hosted git repository.
sunlan 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 85d9b9a Add JDK 14 build to travis CI
85d9b9a is described below
commit 85d9b9a8e1f99fc84a74a6fab352fc9992fa313a
Author: Daniel Sun <su...@apache.org>
AuthorDate: Sat Mar 21 13:24:21 2020 +0800
Add JDK 14 build to travis CI
---
.travis.yml | 4 ++++
gradle.properties | 2 +-
gradle/wrapper/gradle-wrapper.jar | Bin 58695 -> 58702 bytes
gradle/wrapper/gradle-wrapper.properties | 2 +-
gradlew.bat | 3 ---
src/test/gls/annotations/AnnotationTest.groovy | 10 +++++++---
6 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 1f0ba25a..a75e5ce 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,8 @@ install: true
matrix:
include:
- env: BC='legacy'
+ jdk: openjdk14
+ - env: BC='legacy'
jdk: openjdk13
- env: BC='legacy'
jdk: openjdk12
@@ -37,6 +39,8 @@ matrix:
jdk: oraclejdk8
- env: BC='indy'
+ jdk: openjdk14
+ - env: BC='indy'
jdk: openjdk13
- env: BC='indy'
jdk: openjdk12
diff --git a/gradle.properties b/gradle.properties
index 760ad55..3d9943d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -17,7 +17,7 @@ groovyVersion = 4.0.0-SNAPSHOT
# bundle version format: major('.'minor('.'micro('.'qualifier)?)?)? (first 3 only digits)
groovyBundleVersion = 4.0.0.SNAPSHOT
-gradle_version=6.2.2
+gradle_version=6.3-rc-4
groovyJUnit_ms=512m
groovyJUnit_mx=2g
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f3d88b1..cc4fdc2 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index a2bf131..b43cc6e 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-6.2.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-rc-4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
diff --git a/gradlew.bat b/gradlew.bat
index 9109989..24467a1 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -29,9 +29,6 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
diff --git a/src/test/gls/annotations/AnnotationTest.groovy b/src/test/gls/annotations/AnnotationTest.groovy
index 43d26f0..c91078c 100644
--- a/src/test/gls/annotations/AnnotationTest.groovy
+++ b/src/test/gls/annotations/AnnotationTest.groovy
@@ -641,7 +641,9 @@ final class AnnotationTest extends CompilableTestSupport {
def string = getClass().getMethod('method').getAnnotation(Foo).toString()[5..-2].tokenize(', ').sort().join('|')
assert string == 'b=6|c1=A|c2=B|c3=C|c4=D|d1=2.0|d2=2.1|d3=2.2|d4=2.3|f1=1.0|f2=1.1|f3=1.2|f4=1.3|i1=0|i2=1|s1=2|s2=3|s3=4|s4=5' ||
// changed in some jdk9 versions
- string == "b=6|c1='A'|c2='B'|c3='C'|c4='D'|d1=2.0|d2=2.1|d3=2.2|d4=2.3|f1=1.0f|f2=1.1f|f3=1.2f|f4=1.3f|i1=0|i2=1|s1=2|s2=3|s3=4|s4=5"
+ string == "b=6|c1='A'|c2='B'|c3='C'|c4='D'|d1=2.0|d2=2.1|d3=2.2|d4=2.3|f1=1.0f|f2=1.1f|f3=1.2f|f4=1.3f|i1=0|i2=1|s1=2|s2=3|s3=4|s4=5" ||
+ // changed in some jdk14 versions
+ string == "b=(byte)0x06|c1='A'|c2='B'|c3='C'|c4='D'|d1=2.0|d2=2.1|d3=2.2|d4=2.3|f1=1.0f|f2=1.1f|f3=1.2f|f4=1.3f|i1=0|i2=1|s1=2|s2=3|s3=4|s4=5"
'''
}
@@ -713,7 +715,8 @@ final class AnnotationTest extends CompilableTestSupport {
// TODO confirm the JDK9 behavior is what we expect
private static final List<String> expected = [
'@MyAnnotationArray(value=[@MyAnnotation(value=val1), @MyAnnotation(value=val2)])', // JDK5-8
- '@MyAnnotationArray(value={@MyAnnotation(value="val1"), @MyAnnotation(value="val2")})' // JDK9
+ '@MyAnnotationArray(value={@MyAnnotation(value="val1"), @MyAnnotation(value="val2")})', // JDK9
+ '@MyAnnotationArray({@MyAnnotation("val1"), @MyAnnotation("val2")})' // JDK14
]
// control
@@ -907,7 +910,8 @@ final class AnnotationTest extends CompilableTestSupport {
// TODO confirm the JDK9 behavior is what we expect
private static final List<String> expected = [
'@gls.annotations.Requires(value=[@gls.annotations.Require(value=val1), @gls.annotations.Require(value=val2)])', // JDK5-8
- '@gls.annotations.Requires(value={@gls.annotations.Require(value="val1"), @gls.annotations.Require(value="val2")})' // JDK9
+ '@gls.annotations.Requires(value={@gls.annotations.Require(value="val1"), @gls.annotations.Require(value="val2")})', // JDK9
+ '@gls.annotations.Requires({@gls.annotations.Require("val1"), @gls.annotations.Require("val2")})' // JDK14
]
// control