groovy-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pa...@apache.org
Subject groovy git commit: bump Java 1.6 test usage to 1.7 to make test suite pass on JDK12
Date Wed, 12 Sep 2018 12:51:28 GMT
Repository: groovy
Updated Branches:
  refs/heads/master 9a8b38f54 -> 2b8b101c9


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/2b8b101c
Tree: http://git-wip-us.apache.org/repos/asf/groovy/tree/2b8b101c
Diff: http://git-wip-us.apache.org/repos/asf/groovy/diff/2b8b101c

Branch: refs/heads/master
Commit: 2b8b101c9be27a43acb8036990c225261077e48a
Parents: 9a8b38f
Author: Paul King <paulk@asert.com.au>
Authored: Wed Sep 12 22:51:15 2018 +1000
Committer: Paul King <paulk@asert.com.au>
Committed: Wed Sep 12 22:51:15 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/2b8b101c/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/2b8b101c/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/2b8b101c/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}"/>


Mime
View raw message