Update the Groovy plug-in to 4.0.0-beta-1

#1297
groovy · Sep 7, 2021 · 41c4897 · 41c4897
1 parent 4cad494
commit 41c4897
Show file tree

Hide file tree

Showing 116 changed files with 6,513 additions and 11,028 deletions.
diff --git a/....core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java b/....core.tests.builder/src/org/eclipse/jdt/core/groovy/tests/search/DGMInferencingTests.java
@@ -1015,7 +1015,8 @@ public void testDGMDeclaring6() {
     public void testDGMDeclaring7() {
         String contents = "['x','y','z'].stream().toList()";
         float version = Float.parseFloat(System.getProperty("java.specification.version"));
-        assertDeclType(contents, "toList", version > 15 ? "java.util.stream.Stream<java.lang.String>" : "org.codehaus.groovy.vmplugin.v8.PluginDefaultGroovyMethods");
+        assertDeclType(contents, "toList", version > 15 ? "java.util.stream.Stream<java.lang.String>"
+            : isAtLeastGroovy(40) ? "org.codehaus.groovy.runtime.StreamGroovyMethods" : "org.codehaus.groovy.vmplugin.v8.PluginDefaultGroovyMethods");
     }
 
     @Test // https://github.com/groovy/groovy-eclipse/issues/1002