Repository: groovy Updated Branches: refs/heads/GROOVY_2_5_X b9f85fd32 -> 80fe71566
bump Java 1.6 test usage to 1.7 to make test suite pass on JDK12 Project: http://git-wip-us.apache.org/repos/asf/groovy/repo Commit: http://git-wip-us.apache.org/repos/asf/groovy/commit/b9dab0a8 Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/b9dab0a8 Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/b9dab0a8 Branch: refs/heads/GROOVY_2_5_X Commit: b9dab0a887bb76acf062229be860906223c6ece0 Parents: b9f85fd Author: Paul King <[email protected]> Authored: Wed Sep 12 22:51:15 2018 +1000 Committer: Paul King <[email protected]> Committed: Thu Sep 13 09:10:08 2018 +1000 ---------------------------------------------------------------------- gradle/test.gradle | 4 ++-- src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy | 2 +- .../src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/groovy/blob/b9dab0a8/gradle/test.gradle ---------------------------------------------------------------------- diff --git a/gradle/test.gradle b/gradle/test.gradle index 2abca7c..a2dae8a 100644 --- a/gradle/test.gradle +++ b/gradle/test.gradle @@ -142,8 +142,8 @@ task compileTestExtensionModule(type: JavaCompile) { classpath = files(jar) source fileTree("$extModuleFixtureDir/src/main/java") destinationDir = file("$extModuleOutputDir/classes") - sourceCompatibility = 1.6 - targetCompatibility = 1.6 + sourceCompatibility = 1.7 + targetCompatibility = 1.7 } task testExtensionModuleJar(type: Jar) { http://git-wip-us.apache.org/repos/asf/groovy/blob/b9dab0a8/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy ---------------------------------------------------------------------- diff --git a/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy b/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy index 6d959a9..f3d39f9 100644 --- a/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy +++ b/src/test/org/codehaus/groovy/classgen/GenericsGenTest.groovy @@ -66,7 +66,7 @@ class GenericsGenTest extends GroovyTestCase { config.targetDirectory = createTempDir("groovy-target-", "-target") config.jointCompilationOptions = [ "stubDir": createTempDir("groovy-stub-", "-stub"), - "namedValues": ["target", "1.6", "source", "1.6"] as String[] + "namedValues": ["target", "1.7", "source", "1.7"] as String[] ] config.classpath = "target/classes" FileSystemCompiler compiler = new FileSystemCompiler(config) http://git-wip-us.apache.org/repos/asf/groovy/blob/b9dab0a8/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml ---------------------------------------------------------------------- diff --git a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml index 05e33f4..2a3f68b 100644 --- a/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml +++ b/subprojects/groovy-ant/src/test-resources/org/codehaus/groovy/ant/GroovycTest.xml @@ -25,7 +25,7 @@ <property name="srcPath" value="."/> <property name="destPath" value="${user.dir}/target/classes/groovy/test"/> - <property name="javaVersion" value="6"/> + <property name="javaVersion" value="7"/> <path id="groovyMaterials"> <pathelement path="${java.class.path}"/>
