Eclipse 4.16 (M1) JDT Patch for Groovy-Eclipse: JDT commit 64f1a51

#1075 #1061

base/org.codehaus.groovy30/META-INF/MANIFEST.MF

@@ -12,7 +12,6 @@ Bundle-ClassPath: eclipse-trace.jar,
  lib/groovy-test-3.0.3-indy.jar
 Export-Package: groovy.beans;version="3.0.3",
  groovy.cli;version="3.0.3",
- groovy.cli.internal;version="3.0.3",
  groovy.grape;version="3.0.3",
  groovy.inspect;version="3.0.3",
  groovy.io;version="3.0.3",

base/org.eclipse.jdt.groovy.core/src/org/eclipse/jdt/groovy/core/util/JavaConstants.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2019 the original author or authors.
+ * Copyright 2009-2020 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,18 +23,23 @@ public abstract class JavaConstants {
     public static int AST_LEVEL = AST.JLS10;
     static {
         try {
-            AST.class.getDeclaredField("JLS13");
+            AST.class.getDeclaredField("JLS14");
             AST_LEVEL = 13;
-        } catch (NoSuchFieldException ignore13) {
+        } catch (NoSuchFieldException ignore14) {
             try {
-                AST.class.getDeclaredField("JLS12");
-                AST_LEVEL = 12;
-            } catch (NoSuchFieldException ignore12) {
+                AST.class.getDeclaredField("JLS13");
+                AST_LEVEL = 13;
+            } catch (NoSuchFieldException ignore13) {
                 try {
-                    AST.class.getDeclaredField("JLS11");
-                    AST_LEVEL = 11;
-                } catch (NoSuchFieldException ignore11) {
-                    // AST_LEVEL is JLS10
+                    AST.class.getDeclaredField("JLS12");
+                    AST_LEVEL = 12;
+                } catch (NoSuchFieldException ignore12) {
+                    try {
+                        AST.class.getDeclaredField("JLS11");
+                        AST_LEVEL = 11;
+                    } catch (NoSuchFieldException ignore11) {
+                        // AST_LEVEL is JLS10
+                    }
                 }
             }
         }

docs/Getting-Started-with-Groovy-Eclipse-Source-Code.md

@@ -57,7 +57,7 @@ The installer then downloads the required target platform bundles, imports the G
 
 ![Done](images/oomph/done.png)
 
-Close all org.codehaus.groovyXX projects except org.codehaus.groovy25. Only one groovyXXX project should be open at all times.
+Close all org.codehaus.groovyXX projects except org.codehaus.groovy30. Only one groovyXXX project should be open at all times.
 Now try to run the GroovyJDTTests/AllGroovyTests suites.
 
 
@@ -194,6 +194,7 @@ Replace e49 with a different option to build it for another Eclipse version:
 * e4.13
 * e4.14
 * e4.15
+* e4.16
 
 Tests will be executed as part of the build.  To skip them, append this option to the command: `-Dmaven.test.skip=true`.
 

docs/Manual-Setup.md

@@ -4,19 +4,19 @@ These are old instructions for setting up a Groovy-Eclipse development environme
 
 ### Get the Base Eclipse Package
 
-Groovy-Eclipse is intended to be developed using Eclipse. Download and install [the "Eclipse IDE for Eclipse Committers" package](https://www.eclipse.org/downloads/packages/release/2019-12/r/eclipse-ide-eclipse-committers) for your operating system.
+Groovy-Eclipse is intended to be developed using Eclipse. Download and install [the "Eclipse IDE for Eclipse Committers" package](https://www.eclipse.org/downloads/packages/release/2020-03/r/eclipse-ide-eclipse-committers) for your operating system.
 
 ### Install Groovy-Eclipse
 
-On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, paste the Groovy-Eclipse update site `https://dist.springsource.org/snapshot/GRECLIPSE/e4.14` into the *Work with:* field and press enter. Check the box next to "Main Package", then click the *Next* button a couple of times, accept the license agreement, and let Eclipse restart.
+On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, paste the Groovy-Eclipse update site `https://dist.springsource.org/snapshot/GRECLIPSE/e4.15` into the *Work with:* field and press enter. Check the box next to "Main Package", then click the *Next* button a couple of times, accept the license agreement, and let Eclipse restart.
 
 ### Setup Groovy Compiler
 
 If you installed extran Groovy compiler versions, then you must activate Groovy 2.4 compiler for Groovy-Eclipse.  On the Eclipse menu bar, select *Window -> Preferences*.  In the *Preferences* window, go to *Groovy -> Compiler*. Click the *Switch to 2.4.19* button, and let Eclipse restart.
 
 ### Install Execution Environment Descriptions
 
-On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, select `2019-12 - https://download.eclipse.org/releases/2019-12` from the *Work with:* field and enter "exeuction" in the filter. Check the boxes next to "API Tools Execution Environment Descriptions", and click the *Next* button a couple of times, accept the license agreement, and let Eclipse restart.
+On the Eclipse menu bar, select *Help -> Install New Software...*.  In the *Install* window, select `2020-03 - https://download.eclipse.org/releases/2020-03` from the *Work with:* field and enter "exeuction" in the filter. Check the boxes next to "API Tools Execution Environment Descriptions", and click the *Next* button a couple of times, accept the license agreement, and let Eclipse restart.
 
 ![API Baseline](images/eclipse-api-tools-execution-environment.png)
 

groovy-eclipse.setup

@@ -69,9 +69,12 @@
   <setupTask
       xsi:type="setup:VariableTask"
       name="eclipse.target.platform"
-      defaultValue="2019-12"
+      defaultValue="2020-03"
       storageURI="scope://Workspace"
       label="Target Platform">
+    <choice
+        value="2020-06"
+        label="Eclipse 4.16 (2020-06)"/>
     <choice
         value="2020-03"
         label="Eclipse 4.15 (2020-03)"/>
@@ -87,9 +90,6 @@
     <choice
         value="2019-03"
         label="Eclipse 4.11 (2019-03)"/>
-    <choice
-        value="2018-12"
-        label="Eclipse 4.10 (2018-12)"/>
     <description>Choose the compatibility level of the target platform</description>
   </setupTask>
   <setupTask
@@ -126,7 +126,15 @@
   </setupTask>
   <setupTask
       xsi:type="setup.p2:P2Task"
-      filter="(| (scope.product.version.name=2020-03) (scope.product.version.name=latest) (scope.product.version.name=latest.released))">
+      filter="(| (scope.product.version.name=2020-06) (scope.product.version.name=latest))">
+    <requirement
+        name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
+    <repository
+        url="https://dist.springsource.org/snapshot/GRECLIPSE/e4.16"/>
+  </setupTask>
+  <setupTask
+      xsi:type="setup.p2:P2Task"
+      filter="(| (scope.product.version.name=2020-03) (scope.product.version.name=latest.released))">
     <requirement
         name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
     <repository
@@ -164,14 +172,6 @@
     <repository
         url="https://dist.springsource.org/snapshot/GRECLIPSE/e4.11"/>
   </setupTask>
-  <setupTask
-      xsi:type="setup.p2:P2Task"
-      filter="(scope.product.version.name=2018-12)">
-    <requirement
-        name="org.codehaus.groovy.m2eclipse.feature.feature.group"/>
-    <repository
-        url="https://dist.springsource.org/snapshot/GRECLIPSE/e4.10"/>
-  </setupTask>
   <setupTask
       xsi:type="git:GitCloneTask"
       id="git.clone.Groovy-Eclipse"
@@ -225,6 +225,13 @@
     <sourceLocator
         rootFolder="${git.clone.Groovy-Eclipse.location}/Site-org.codehaus.groovy.eclipse"/>
   </setupTask>
+  <setupTask
+      xsi:type="projects:ProjectsImportTask"
+      filter="(eclipse.target.platform=2020-06)">
+    <sourceLocator
+        rootFolder="${git.clone.Groovy-Eclipse.location}/jdt-patch/e416"
+        locateNestedProjects="true"/>
+  </setupTask>
   <setupTask
       xsi:type="projects:ProjectsImportTask"
       filter="(eclipse.target.platform=2020-03)">
@@ -260,13 +267,6 @@
         rootFolder="${git.clone.Groovy-Eclipse.location}/jdt-patch/e411"
         locateNestedProjects="true"/>
   </setupTask>
-  <setupTask
-      xsi:type="projects:ProjectsImportTask"
-      filter="(eclipse.target.platform=2018-12)">
-    <sourceLocator
-        rootFolder="${git.clone.Groovy-Eclipse.location}/jdt-patch/e410"
-        locateNestedProjects="true"/>
-  </setupTask>
   <setupTask
       xsi:type="setup.targlets:TargletTask">
     <targlet
@@ -286,6 +286,13 @@
           name="org.eclipse.buildship.feature.group"/>
       <requirement
           name="org.eclipse.test.feature.group"/>
+      <repositoryList
+          name="2020-06">
+        <repository
+            url="https://download.eclipse.org/releases/2020-06"/>
+        <repository
+            url="https://download.eclipse.org/eclipse/updates/4.16milestones"/>
+      </repositoryList>
       <repositoryList
           name="2020-03">
         <repository
@@ -321,13 +328,6 @@
         <repository
             url="https://download.eclipse.org/eclipse/updates/4.11"/>
       </repositoryList>
-      <repositoryList
-          name="2018-12">
-        <repository
-            url="https://download.eclipse.org/releases/2018-12"/>
-        <repository
-            url="https://download.eclipse.org/eclipse/updates/4.10"/>
-      </repositoryList>
     </targlet>
   </setupTask>
   <setupTask